diff --git a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
index 53afbf412..d96e6c2d9 100644
--- a/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
+++ b/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
@@ -89,85 +89,84 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
   static {
     java.lang.String[] descriptorData = {
       "\n\037google/datastore/v1/query.proto\022\023googl"
-          + "e.datastore.v1\032\037google/api/field_behavio"
-          + "r.proto\032 google/datastore/v1/entity.prot"
-          + "o\032\037google/protobuf/timestamp.proto\032\036goog"
-          + "le/protobuf/wrappers.proto\"\340\001\n\014EntityRes"
-          + "ult\022+\n\006entity\030\001 \001(\0132\033.google.datastore.v"
-          + "1.Entity\022\017\n\007version\030\004 \001(\003\022/\n\013update_time"
-          + "\030\005 \001(\0132\032.google.protobuf.Timestamp\022\016\n\006cu"
-          + "rsor\030\003 \001(\014\"Q\n\nResultType\022\033\n\027RESULT_TYPE_"
-          + "UNSPECIFIED\020\000\022\010\n\004FULL\020\001\022\016\n\nPROJECTION\020\002\022"
-          + "\014\n\010KEY_ONLY\020\003\"\362\002\n\005Query\0223\n\nprojection\030\002 "
-          + "\003(\0132\037.google.datastore.v1.Projection\0221\n\004"
-          + "kind\030\003 \003(\0132#.google.datastore.v1.KindExp"
-          + "ression\022+\n\006filter\030\004 \001(\0132\033.google.datasto"
-          + "re.v1.Filter\0221\n\005order\030\005 \003(\0132\".google.dat"
-          + "astore.v1.PropertyOrder\022;\n\013distinct_on\030\006"
-          + " \003(\0132&.google.datastore.v1.PropertyRefer"
-          + "ence\022\024\n\014start_cursor\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.Int32Value\"\036\n\016KindExpres"
-          + "sion\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyReference\022"
-          + "\014\n\004name\030\002 \001(\t\"F\n\nProjection\0228\n\010property\030"
-          + "\001 \001(\0132&.google.datastore.v1.PropertyRefe"
-          + "rence\"\321\001\n\rPropertyOrder\0228\n\010property\030\001 \001("
-          + "\0132&.google.datastore.v1.PropertyReferenc"
-          + "e\022?\n\tdirection\030\002 \001(\0162,.google.datastore."
-          + "v1.PropertyOrder.Direction\"E\n\tDirection\022"
-          + "\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASCENDING\020"
-          + "\001\022\016\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020composit"
-          + "e_filter\030\001 \001(\0132$.google.datastore.v1.Com"
-          + "positeFilterH\000\022>\n\017property_filter\030\002 \001(\0132"
-          + "#.google.datastore.v1.PropertyFilterH\000B\r"
-          + "\n\013filter_type\"\251\001\n\017CompositeFilter\0229\n\002op\030"
-          + "\001 \001(\0162-.google.datastore.v1.CompositeFil"
-          + "ter.Operator\022,\n\007filters\030\002 \003(\0132\033.google.d"
-          + "atastore.v1.Filter\"-\n\010Operator\022\030\n\024OPERAT"
-          + "OR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\"\352\002\n\016PropertyFi"
-          + "lter\0228\n\010property\030\001 \001(\0132&.google.datastor"
-          + "e.v1.PropertyReference\0228\n\002op\030\002 \001(\0162,.goo"
-          + "gle.datastore.v1.PropertyFilter.Operator"
-          + "\022)\n\005value\030\003 \001(\0132\032.google.datastore.v1.Va"
-          + "lue\"\270\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_E"
-          + "QUAL\020\004\022\t\n\005EQUAL\020\005\022\006\n\002IN\020\006\022\r\n\tNOT_EQUAL\020\t"
-          + "\022\020\n\014HAS_ANCESTOR\020\013\022\n\n\006NOT_IN\020\r\"\245\002\n\010GqlQu"
-          + "ery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allow_liter"
-          + "als\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\01320.goog"
-          + "le.datastore.v1.GqlQuery.NamedBindingsEn"
-          + "try\022C\n\023positional_bindings\030\004 \003(\0132&.googl"
-          + "e.datastore.v1.GqlQueryParameter\032\\\n\022Name"
-          + "dBindingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001"
-          + "(\0132&.google.datastore.v1.GqlQueryParamet"
-          + "er:\0028\001\"d\n\021GqlQueryParameter\022+\n\005value\030\002 \001"
-          + "(\0132\032.google.datastore.v1.ValueH\000\022\020\n\006curs"
-          + "or\030\003 \001(\014H\000B\020\n\016parameter_type\"\215\004\n\020QueryRe"
-          + "sultBatch\022\027\n\017skipped_results\030\006 \001(\005\022\026\n\016sk"
-          + "ipped_cursor\030\003 \001(\014\022H\n\022entity_result_type"
-          + "\030\001 \001(\0162,.google.datastore.v1.EntityResul"
-          + "t.ResultType\0229\n\016entity_results\030\002 \003(\0132!.g"
-          + "oogle.datastore.v1.EntityResult\022\022\n\nend_c"
-          + "ursor\030\004 \001(\014\022K\n\014more_results\030\005 \001(\01625.goog"
-          + "le.datastore.v1.QueryResultBatch.MoreRes"
-          + "ultsType\022\030\n\020snapshot_version\030\007 \001(\003\022-\n\tre"
-          + "ad_time\030\010 \001(\0132\032.google.protobuf.Timestam"
-          + "p\"\230\001\n\017MoreResultsType\022!\n\035MORE_RESULTS_TY"
-          + "PE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020\001\022\034\n\030MO"
-          + "RE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_RESULTS"
-          + "_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULTS\020\003B\274\001\n"
-          + "\027com.google.datastore.v1B\nQueryProtoP\001Z<"
-          + "google.golang.org/genproto/googleapis/da"
-          + "tastore/v1;datastore\252\002\031Google.Cloud.Data"
-          + "store.V1\312\002\031Google\\Cloud\\Datastore\\V1\352\002\034G"
-          + "oogle::Cloud::Datastore::V1b\006proto3"
+          + "e.datastore.v1\032 google/datastore/v1/enti"
+          + "ty.proto\032\037google/protobuf/timestamp.prot"
+          + "o\032\036google/protobuf/wrappers.proto\"\340\001\n\014En"
+          + "tityResult\022+\n\006entity\030\001 \001(\0132\033.google.data"
+          + "store.v1.Entity\022\017\n\007version\030\004 \001(\003\022/\n\013upda"
+          + "te_time\030\005 \001(\0132\032.google.protobuf.Timestam"
+          + "p\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResultType\022\033\n\027RESUL"
+          + "T_TYPE_UNSPECIFIED\020\000\022\010\n\004FULL\020\001\022\016\n\nPROJEC"
+          + "TION\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Query\0223\n\nprojec"
+          + "tion\030\002 \003(\0132\037.google.datastore.v1.Project"
+          + "ion\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\005order\030\005 \003(\0132\".goo"
+          + "gle.datastore.v1.PropertyOrder\022;\n\013distin"
+          + "ct_on\030\006 \003(\0132&.google.datastore.v1.Proper"
+          + "tyReference\022\024\n\014start_cursor\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.Int32Value\"\036\n\016Kin"
+          + "dExpression\022\014\n\004name\030\001 \001(\t\"!\n\021PropertyRef"
+          + "erence\022\014\n\004name\030\002 \001(\t\"F\n\nProjection\0228\n\010pr"
+          + "operty\030\001 \001(\0132&.google.datastore.v1.Prope"
+          + "rtyReference\"\321\001\n\rPropertyOrder\0228\n\010proper"
+          + "ty\030\001 \001(\0132&.google.datastore.v1.PropertyR"
+          + "eference\022?\n\tdirection\030\002 \001(\0162,.google.dat"
+          + "astore.v1.PropertyOrder.Direction\"E\n\tDir"
+          + "ection\022\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\tASC"
+          + "ENDING\020\001\022\016\n\nDESCENDING\020\002\"\231\001\n\006Filter\022@\n\020c"
+          + "omposite_filter\030\001 \001(\0132$.google.datastore"
+          + ".v1.CompositeFilterH\000\022>\n\017property_filter"
+          + "\030\002 \001(\0132#.google.datastore.v1.PropertyFil"
+          + "terH\000B\r\n\013filter_type\"\251\001\n\017CompositeFilter"
+          + "\0229\n\002op\030\001 \001(\0162-.google.datastore.v1.Compo"
+          + "siteFilter.Operator\022,\n\007filters\030\002 \003(\0132\033.g"
+          + "oogle.datastore.v1.Filter\"-\n\010Operator\022\030\n"
+          + "\024OPERATOR_UNSPECIFIED\020\000\022\007\n\003AND\020\001\"\352\002\n\016Pro"
+          + "pertyFilter\0228\n\010property\030\001 \001(\0132&.google.d"
+          + "atastore.v1.PropertyReference\0228\n\002op\030\002 \001("
+          + "\0162,.google.datastore.v1.PropertyFilter.O"
+          + "perator\022)\n\005value\030\003 \001(\0132\032.google.datastor"
+          + "e.v1.Value\"\270\001\n\010Operator\022\030\n\024OPERATOR_UNSP"
+          + "ECIFIED\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_TH"
+          + "AN_OR_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\006\n\002IN\020\006\022\r\n\tNOT_"
+          + "EQUAL\020\t\022\020\n\014HAS_ANCESTOR\020\013\022\n\n\006NOT_IN\020\r\"\245\002"
+          + "\n\010GqlQuery\022\024\n\014query_string\030\001 \001(\t\022\026\n\016allo"
+          + "w_literals\030\002 \001(\010\022H\n\016named_bindings\030\005 \003(\013"
+          + "20.google.datastore.v1.GqlQuery.NamedBin"
+          + "dingsEntry\022C\n\023positional_bindings\030\004 \003(\0132"
+          + "&.google.datastore.v1.GqlQueryParameter\032"
+          + "\\\n\022NamedBindingsEntry\022\013\n\003key\030\001 \001(\t\0225\n\005va"
+          + "lue\030\002 \001(\0132&.google.datastore.v1.GqlQuery"
+          + "Parameter:\0028\001\"d\n\021GqlQueryParameter\022+\n\005va"
+          + "lue\030\002 \001(\0132\032.google.datastore.v1.ValueH\000\022"
+          + "\020\n\006cursor\030\003 \001(\014H\000B\020\n\016parameter_type\"\215\004\n\020"
+          + "QueryResultBatch\022\027\n\017skipped_results\030\006 \001("
+          + "\005\022\026\n\016skipped_cursor\030\003 \001(\014\022H\n\022entity_resu"
+          + "lt_type\030\001 \001(\0162,.google.datastore.v1.Enti"
+          + "tyResult.ResultType\0229\n\016entity_results\030\002 "
+          + "\003(\0132!.google.datastore.v1.EntityResult\022\022"
+          + "\n\nend_cursor\030\004 \001(\014\022K\n\014more_results\030\005 \001(\016"
+          + "25.google.datastore.v1.QueryResultBatch."
+          + "MoreResultsType\022\030\n\020snapshot_version\030\007 \001("
+          + "\003\022-\n\tread_time\030\010 \001(\0132\032.google.protobuf.T"
+          + "imestamp\"\230\001\n\017MoreResultsType\022!\n\035MORE_RES"
+          + "ULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014NOT_FINISHED\020"
+          + "\001\022\034\n\030MORE_RESULTS_AFTER_LIMIT\020\002\022\035\n\031MORE_"
+          + "RESULTS_AFTER_CURSOR\020\004\022\023\n\017NO_MORE_RESULT"
+          + "S\020\003B\274\001\n\027com.google.datastore.v1B\nQueryPr"
+          + "otoP\001Z<google.golang.org/genproto/google"
+          + "apis/datastore/v1;datastore\252\002\031Google.Clo"
+          + "ud.Datastore.V1\312\002\031Google\\Cloud\\Datastore"
+          + "\\V1\352\002\034Google::Cloud::Datastore::V1b\006prot"
+          + "o3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
-              com.google.api.FieldBehaviorProto.getDescriptor(),
               com.google.datastore.v1.EntityProto.getDescriptor(),
               com.google.protobuf.TimestampProto.getDescriptor(),
               com.google.protobuf.WrappersProto.getDescriptor(),
@@ -290,7 +289,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "SnapshotVersion",
               "ReadTime",
             });
-    com.google.api.FieldBehaviorProto.getDescriptor();
     com.google.datastore.v1.EntityProto.getDescriptor();
     com.google.protobuf.TimestampProto.getDescriptor();
     com.google.protobuf.WrappersProto.getDescriptor();
diff --git a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto
index cbe44932d..5e9dd9158 100644
--- a/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto
+++ b/proto-google-cloud-datastore-v1/src/main/proto/google/datastore/v1/query.proto
@@ -16,7 +16,6 @@ syntax = "proto3";
 
 package google.datastore.v1;
 
-import "google/api/field_behavior.proto";
 import "google/datastore/v1/entity.proto";
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/wrappers.proto";