Repository: kythe/kythe
Pull request #4526 (2020-05-26 20:39:35)

chore: partially migrate to Go protobuf API v2
Migrate source files that only require an update to the proto import path


Patch:
diff --git a/kythe/go/extractors/bazel/BUILD b/kythe/go/extractors/bazel/BUILD
index 9002fec67..255b2a215 100644
--- a/kythe/go/extractors/bazel/BUILD
+++ b/kythe/go/extractors/bazel/BUILD
@@ -20,8 +20,8 @@ go_library(
         "//kythe/proto:buildinfo_go_proto",
         "//kythe/proto:storage_go_proto",
         "//third_party/bazel:extra_actions_base_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
         "@org_bitbucket_creachadair_stringset//:go_default_library",
+        "@com_github_golang_protobuf//proto:go_default_library",
         "@org_golang_x_sync//errgroup:go_default_library",
     ],
 )
diff --git a/kythe/go/extractors/cmd/bazel/extract_kzip/BUILD b/kythe/go/extractors/cmd/bazel/extract_kzip/BUILD
index ad9dadc6a..03b535879 100644
--- a/kythe/go/extractors/cmd/bazel/extract_kzip/BUILD
+++ b/kythe/go/extractors/cmd/bazel/extract_kzip/BUILD
@@ -11,7 +11,7 @@ go_binary(
         "//kythe/go/platform/kindex",
         "//kythe/go/util/vnameutil",
         "//third_party/bazel:extra_actions_base_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
         "@org_bitbucket_creachadair_stringset//:go_default_library",
     ],
 )
diff --git a/kythe/go/extractors/govname/BUILD b/kythe/go/extractors/govname/BUILD
index b33250ed7..c8f962b6a 100644
--- a/kythe/go/extractors/govname/BUILD
+++ b/kythe/go/extractors/govname/BUILD
@@ -26,6 +26,6 @@ go_test(
     visibility = ["//visibility:private"],
     deps = [
         "//kythe/go/util/kytheuri",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/languageserver/BUILD b/kythe/go/languageserver/BUILD
index 820e0ca0e..56a2e8b73 100644
--- a/kythe/go/languageserver/BUILD
+++ b/kythe/go/languageserver/BUILD
@@ -32,7 +32,7 @@ go_library(
         "//kythe/proto:graph_go_proto",
         "//kythe/proto:xref_go_proto",
         "@com_github_golang_protobuf//jsonpb:go_default_library_gen",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
         "@com_github_sergi_go_diff//diffmatchpatch:go_default_library",
         "@com_github_sourcegraph_go_langserver//pkg/lsp:go_default_library",
         "@com_github_sourcegraph_jsonrpc2//:go_default_library",
diff --git a/kythe/go/platform/analysis/BUILD b/kythe/go/platform/analysis/BUILD
index addf315b7..86542b2fc 100644
--- a/kythe/go/platform/analysis/BUILD
+++ b/kythe/go/platform/analysis/BUILD
@@ -9,6 +9,6 @@ go_library(
         "//kythe/proto:analysis_go_proto",
         "//kythe/proto:analysis_service_go_proto",
         "//kythe/proto:storage_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/platform/analysis/analysis.go b/kythe/go/platform/analysis/analysis.go
index 021c3fdf9..39ff2c8b4 100644
--- a/kythe/go/platform/analysis/analysis.go
+++ b/kythe/go/platform/analysis/analysis.go
@@ -27,7 +27,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	apb "kythe.io/kythe/proto/analysis_go_proto"
 	spb "kythe.io/kythe/proto/storage_go_proto"
diff --git a/kythe/go/platform/delimited/BUILD b/kythe/go/platform/delimited/BUILD
index 67dc5cb64..ae9f831da 100644
--- a/kythe/go/platform/delimited/BUILD
+++ b/kythe/go/platform/delimited/BUILD
@@ -10,7 +10,7 @@ go_library(
     ],
     deps = [
         "//kythe/go/util/dedup",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
 
diff --git a/kythe/go/platform/delimited/dedup/BUILD b/kythe/go/platform/delimited/dedup/BUILD
index aec81a86b..566793c91 100644
--- a/kythe/go/platform/delimited/dedup/BUILD
+++ b/kythe/go/platform/delimited/dedup/BUILD
@@ -8,6 +8,6 @@ go_library(
     deps = [
         "//kythe/go/platform/delimited",
         "//kythe/go/util/dedup",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/platform/delimited/dedup/dedup.go b/kythe/go/platform/delimited/dedup/dedup.go
index e14f51d2a..adc1f25fb 100644
--- a/kythe/go/platform/delimited/dedup/dedup.go
+++ b/kythe/go/platform/delimited/dedup/dedup.go
@@ -29,7 +29,7 @@ import (
 	"kythe.io/kythe/go/platform/delimited"
 	"kythe.io/kythe/go/util/dedup"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // Reader implements the Reader interface.  Duplicate records are removed by
diff --git a/kythe/go/platform/delimited/delimited.go b/kythe/go/platform/delimited/delimited.go
index ccf3a9cba..e053eda11 100644
--- a/kythe/go/platform/delimited/delimited.go
+++ b/kythe/go/platform/delimited/delimited.go
@@ -28,7 +28,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // Reader consumes length-delimited records from a byte source.
diff --git a/kythe/go/platform/kcd/kzipdb/BUILD b/kythe/go/platform/kcd/kzipdb/BUILD
index 6c4938f22..af4f2c62c 100644
--- a/kythe/go/platform/kcd/kzipdb/BUILD
+++ b/kythe/go/platform/kcd/kzipdb/BUILD
@@ -9,7 +9,7 @@ go_library(
         "//kythe/go/platform/kcd",
         "//kythe/go/platform/kcd/kythe",
         "//kythe/go/platform/kzip",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
 
diff --git a/kythe/go/platform/kcd/kzipdb/kzipdb.go b/kythe/go/platform/kcd/kzipdb/kzipdb.go
index 4443d06f1..f7d29e926 100644
--- a/kythe/go/platform/kcd/kzipdb/kzipdb.go
+++ b/kythe/go/platform/kcd/kzipdb/kzipdb.go
@@ -21,7 +21,7 @@ package kzipdb // import "kythe.io/kythe/go/platform/kcd/kzipdb"
 import (
 	"context"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 	"kythe.io/kythe/go/platform/kcd"
 	"kythe.io/kythe/go/platform/kcd/kythe"
 	"kythe.io/kythe/go/platform/kzip"
diff --git a/kythe/go/platform/kcd/memdb/BUILD b/kythe/go/platform/kcd/memdb/BUILD
index ca38fc7a3..0d05eb824 100644
--- a/kythe/go/platform/kcd/memdb/BUILD
+++ b/kythe/go/platform/kcd/memdb/BUILD
@@ -7,7 +7,7 @@ go_library(
     srcs = ["memdb.go"],
     deps = [
         "//kythe/go/platform/kcd",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
 
diff --git a/kythe/go/platform/kzip/info/BUILD b/kythe/go/platform/kzip/info/BUILD
index 30f0964c7..b5393b3d6 100644
--- a/kythe/go/platform/kzip/info/BUILD
+++ b/kythe/go/platform/kzip/info/BUILD
@@ -22,6 +22,6 @@ go_test(
     deps = [
         "//kythe/proto:analysis_go_proto",
         "//kythe/proto:storage_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/platform/tools/entrystream/BUILD b/kythe/go/platform/tools/entrystream/BUILD
index 06eab5a5d..4b75bea9e 100644
--- a/kythe/go/platform/tools/entrystream/BUILD
+++ b/kythe/go/platform/tools/entrystream/BUILD
@@ -14,6 +14,6 @@ go_binary(
         "//kythe/go/util/flagutil",
         "//kythe/go/util/riegeli",
         "//kythe/proto:storage_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/platform/tools/entrystream/entrystream.go b/kythe/go/platform/tools/entrystream/entrystream.go
index 0a86a85e8..7f3069674 100644
--- a/kythe/go/platform/tools/entrystream/entrystream.go
+++ b/kythe/go/platform/tools/entrystream/entrystream.go
@@ -47,7 +47,7 @@ import (
 	"kythe.io/kythe/go/util/flagutil"
 	"kythe.io/kythe/go/util/riegeli"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	spb "kythe.io/kythe/proto/storage_go_proto"
 )
diff --git a/kythe/go/platform/tools/kzip/mergecmd/BUILD b/kythe/go/platform/tools/kzip/mergecmd/BUILD
index 16b173a37..6a3b9c55d 100644
--- a/kythe/go/platform/tools/kzip/mergecmd/BUILD
+++ b/kythe/go/platform/tools/kzip/mergecmd/BUILD
@@ -14,7 +14,7 @@ go_library(
         "//kythe/go/platform/vfs",
         "//kythe/go/util/cmdutil",
         "//kythe/go/util/vnameutil",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
         "@com_github_google_subcommands//:go_default_library",
         "@org_bitbucket_creachadair_stringset//:go_default_library",
     ],
diff --git a/kythe/go/services/explore/BUILD b/kythe/go/services/explore/BUILD
index e0d982206..52749e135 100644
--- a/kythe/go/services/explore/BUILD
+++ b/kythe/go/services/explore/BUILD
@@ -10,7 +10,7 @@ go_library(
     srcs = ["explore.go"],
     deps = [
         "//kythe/proto:explore_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
         "@org_golang_google_grpc//codes:go_default_library",
         "@org_golang_google_grpc//status:go_default_library",
     ],
diff --git a/kythe/go/services/filetree/BUILD b/kythe/go/services/filetree/BUILD
index 579ff0947..c14b79a4a 100644
--- a/kythe/go/services/filetree/BUILD
+++ b/kythe/go/services/filetree/BUILD
@@ -12,6 +12,6 @@ go_library(
         "//kythe/go/util/schema/nodes",
         "//kythe/proto:filetree_go_proto",
         "//kythe/proto:storage_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/services/filetree/filetree.go b/kythe/go/services/filetree/filetree.go
index d033092b7..c8b5c431b 100644
--- a/kythe/go/services/filetree/filetree.go
+++ b/kythe/go/services/filetree/filetree.go
@@ -33,7 +33,7 @@ import (
 	"kythe.io/kythe/go/util/schema/facts"
 	"kythe.io/kythe/go/util/schema/nodes"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	ftpb "kythe.io/kythe/proto/filetree_go_proto"
 	spb "kythe.io/kythe/proto/storage_go_proto"
diff --git a/kythe/go/services/graphstore/proxy/BUILD b/kythe/go/services/graphstore/proxy/BUILD
index b9e7a9ac8..412fb404f 100644
--- a/kythe/go/services/graphstore/proxy/BUILD
+++ b/kythe/go/services/graphstore/proxy/BUILD
@@ -22,6 +22,6 @@ go_test(
     deps = [
         "//kythe/go/services/graphstore",
         "//kythe/proto:storage_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/serving/explore/BUILD b/kythe/go/serving/explore/BUILD
index 848fc848e..543ad1b56 100644
--- a/kythe/go/serving/explore/BUILD
+++ b/kythe/go/serving/explore/BUILD
@@ -13,7 +13,7 @@ go_library(
         "//kythe/go/storage/table",
         "//kythe/proto:explore_go_proto",
         "//kythe/proto:serving_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
         "@org_bitbucket_creachadair_stringset//:go_default_library",
         "@org_golang_google_grpc//codes:go_default_library",
         "@org_golang_google_grpc//status:go_default_library",
diff --git a/kythe/go/serving/graph/BUILD b/kythe/go/serving/graph/BUILD
index 283396e54..864549bc1 100644
--- a/kythe/go/serving/graph/BUILD
+++ b/kythe/go/serving/graph/BUILD
@@ -24,7 +24,7 @@ go_library(
         "//kythe/proto:internal_go_proto",
         "//kythe/proto:schema_go_proto",
         "//kythe/proto:serving_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
         "@org_bitbucket_creachadair_stringset//:go_default_library",
         "@org_golang_x_net//trace:go_default_library",
     ],
diff --git a/kythe/go/serving/graph/columnar.go b/kythe/go/serving/graph/columnar.go
index f6be0dd79..37d383185 100644
--- a/kythe/go/serving/graph/columnar.go
+++ b/kythe/go/serving/graph/columnar.go
@@ -35,7 +35,7 @@ import (
 	"kythe.io/kythe/go/util/schema/facts"
 
 	"bitbucket.org/creachadair/stringset"
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	cpb "kythe.io/kythe/proto/common_go_proto"
 	gpb "kythe.io/kythe/proto/graph_go_proto"
diff --git a/kythe/go/serving/graph/columnar/BUILD b/kythe/go/serving/graph/columnar/BUILD
index e68b7bb30..655d2a107 100644
--- a/kythe/go/serving/graph/columnar/BUILD
+++ b/kythe/go/serving/graph/columnar/BUILD
@@ -10,7 +10,7 @@ go_library(
         "//kythe/proto:graph_serving_go_proto",
         "//kythe/proto:schema_go_proto",
         "//kythe/proto:storage_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
 
diff --git a/kythe/go/serving/graph/columnar/columnar_encoding.go b/kythe/go/serving/graph/columnar/columnar_encoding.go
index 1280dec3a..0014d9961 100644
--- a/kythe/go/serving/graph/columnar/columnar_encoding.go
+++ b/kythe/go/serving/graph/columnar/columnar_encoding.go
@@ -22,7 +22,7 @@ import (
 
 	"kythe.io/kythe/go/util/keys"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	gspb "kythe.io/kythe/proto/graph_serving_go_proto"
 	scpb "kythe.io/kythe/proto/schema_go_proto"
diff --git a/kythe/go/serving/graph/graph.go b/kythe/go/serving/graph/graph.go
index fc6a740ea..496910fe5 100644
--- a/kythe/go/serving/graph/graph.go
+++ b/kythe/go/serving/graph/graph.go
@@ -34,8 +34,8 @@ import (
 	"kythe.io/kythe/go/storage/table"
 
 	"bitbucket.org/creachadair/stringset"
-	"github.com/golang/protobuf/proto"
 	"golang.org/x/net/trace"
+	"google.golang.org/protobuf/proto"
 
 	cpb "kythe.io/kythe/proto/common_go_proto"
 	gpb "kythe.io/kythe/proto/graph_go_proto"
diff --git a/kythe/go/serving/identifiers/BUILD b/kythe/go/serving/identifiers/BUILD
index 27f81f880..01d97c18f 100644
--- a/kythe/go/serving/identifiers/BUILD
+++ b/kythe/go/serving/identifiers/BUILD
@@ -15,7 +15,7 @@ go_library(
         "//kythe/proto:identifier_go_proto",
         "//kythe/proto:internal_go_proto",
         "//kythe/proto:serving_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
 
@@ -27,7 +27,7 @@ go_test(
     visibility = ["//visibility:private"],
     deps = [
         "//kythe/go/test/testutil",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
         "@org_golang_x_text//encoding:go_default_library",
         "@org_golang_x_text//encoding/unicode:go_default_library",
         "@org_golang_x_text//transform:go_default_library",
diff --git a/kythe/go/serving/pipeline/BUILD b/kythe/go/serving/pipeline/BUILD
index 84e2e55db..913e480d7 100644
--- a/kythe/go/serving/pipeline/BUILD
+++ b/kythe/go/serving/pipeline/BUILD
@@ -43,7 +43,7 @@ go_library(
         "//kythe/proto:xref_serving_go_proto",
         "@com_github_apache_beam//sdks/go/pkg/beam:go_default_library",
         "@com_github_apache_beam//sdks/go/pkg/beam/transforms/filter:go_default_library",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
         "@org_bitbucket_creachadair_stringset//:go_default_library",
     ],
 )
diff --git a/kythe/go/serving/pipeline/beam.go b/kythe/go/serving/pipeline/beam.go
index a6be403b5..ffc980b26 100644
--- a/kythe/go/serving/pipeline/beam.go
+++ b/kythe/go/serving/pipeline/beam.go
@@ -35,7 +35,7 @@ import (
 
 	"github.com/apache/beam/sdks/go/pkg/beam"
 	"github.com/apache/beam/sdks/go/pkg/beam/transforms/filter"
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	cpb "kythe.io/kythe/proto/common_go_proto"
 	gspb "kythe.io/kythe/proto/graph_serving_go_proto"
@@ -126,7 +126,9 @@ type KytheBeam struct {
 
 // FromNodes creates a KytheBeam pipeline from an input collection of
 // *spb.Nodes.
-func FromNodes(s beam.Scope, nodes beam.PCollection) *KytheBeam { return &KytheBeam{s: s, nodes: nodes} }
+func FromNodes(s beam.Scope, nodes beam.PCollection) *KytheBeam {
+	return &KytheBeam{s: s, nodes: nodes}
+}
 
 // FromEntries creates a KytheBeam pipeline from an input collection of
 // *spb.Entry messages.
diff --git a/kythe/go/serving/pipeline/pipeline.go b/kythe/go/serving/pipeline/pipeline.go
index 4dd263aab..83f4c0e64 100644
--- a/kythe/go/serving/pipeline/pipeline.go
+++ b/kythe/go/serving/pipeline/pipeline.go
@@ -43,7 +43,7 @@ import (
 	"kythe.io/kythe/go/util/sortutil"
 	"kythe.io/kythe/go/util/span"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	ftpb "kythe.io/kythe/proto/filetree_go_proto"
 	ipb "kythe.io/kythe/proto/internal_go_proto"
diff --git a/kythe/go/serving/xrefs/BUILD b/kythe/go/serving/xrefs/BUILD
index 7d77fe835..2246990cd 100644
--- a/kythe/go/serving/xrefs/BUILD
+++ b/kythe/go/serving/xrefs/BUILD
@@ -28,7 +28,7 @@ go_library(
         "//kythe/proto:serving_go_proto",
         "//kythe/proto:xref_go_proto",
         "//kythe/proto:xref_serving_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
         "@com_github_golang_snappy//:go_default_library",
         "@org_bitbucket_creachadair_stringset//:go_default_library",
         "@org_golang_google_grpc//codes:go_default_library",
diff --git a/kythe/go/serving/xrefs/assemble/BUILD b/kythe/go/serving/xrefs/assemble/BUILD
index b36622f35..0eade4923 100644
--- a/kythe/go/serving/xrefs/assemble/BUILD
+++ b/kythe/go/serving/xrefs/assemble/BUILD
@@ -34,6 +34,6 @@ go_test(
     visibility = ["//visibility:private"],
     deps = [
         "//kythe/go/test/testutil",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/serving/xrefs/columnar.go b/kythe/go/serving/xrefs/columnar.go
index dab971edc..6e32b7e34 100644
--- a/kythe/go/serving/xrefs/columnar.go
+++ b/kythe/go/serving/xrefs/columnar.go
@@ -35,9 +35,9 @@ import (
 	"kythe.io/kythe/go/util/span"
 
 	"bitbucket.org/creachadair/stringset"
-	"github.com/golang/protobuf/proto"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
 
 	cpb "kythe.io/kythe/proto/common_go_proto"
 	scpb "kythe.io/kythe/proto/schema_go_proto"
diff --git a/kythe/go/serving/xrefs/columnar/BUILD b/kythe/go/serving/xrefs/columnar/BUILD
index 6d067f388..39f74e43b 100644
--- a/kythe/go/serving/xrefs/columnar/BUILD
+++ b/kythe/go/serving/xrefs/columnar/BUILD
@@ -11,7 +11,7 @@ go_library(
         "//kythe/proto:schema_go_proto",
         "//kythe/proto:storage_go_proto",
         "//kythe/proto:xref_serving_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
 
diff --git a/kythe/go/serving/xrefs/columnar/columnar_encoding.go b/kythe/go/serving/xrefs/columnar/columnar_encoding.go
index 42a8c3fd2..c85a013f0 100644
--- a/kythe/go/serving/xrefs/columnar/columnar_encoding.go
+++ b/kythe/go/serving/xrefs/columnar/columnar_encoding.go
@@ -25,7 +25,7 @@ import (
 	"kythe.io/kythe/go/util/keys"
 	"kythe.io/kythe/go/util/kytheuri"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	scpb "kythe.io/kythe/proto/schema_go_proto"
 	spb "kythe.io/kythe/proto/storage_go_proto"
diff --git a/kythe/go/serving/xrefs/xrefs.go b/kythe/go/serving/xrefs/xrefs.go
index 5318343f3..3c61f4dc1 100644
--- a/kythe/go/serving/xrefs/xrefs.go
+++ b/kythe/go/serving/xrefs/xrefs.go
@@ -43,11 +43,11 @@ import (
 	"kythe.io/kythe/go/util/span"
 
 	"bitbucket.org/creachadair/stringset"
-	"github.com/golang/protobuf/proto"
 	"github.com/golang/snappy"
 	"golang.org/x/net/trace"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
 
 	cpb "kythe.io/kythe/proto/common_go_proto"
 	ipb "kythe.io/kythe/proto/internal_go_proto"
diff --git a/kythe/go/storage/inmemory/BUILD b/kythe/go/storage/inmemory/BUILD
index c196ae679..bef9c9efe 100644
--- a/kythe/go/storage/inmemory/BUILD
+++ b/kythe/go/storage/inmemory/BUILD
@@ -10,7 +10,7 @@ go_library(
         "//kythe/go/storage/keyvalue",
         "//kythe/go/util/compare",
         "//kythe/proto:storage_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
 
diff --git a/kythe/go/storage/inmemory/inmemory.go b/kythe/go/storage/inmemory/inmemory.go
index a2636bb68..281cafa52 100644
--- a/kythe/go/storage/inmemory/inmemory.go
+++ b/kythe/go/storage/inmemory/inmemory.go
@@ -30,7 +30,7 @@ import (
 	"kythe.io/kythe/go/storage/keyvalue"
 	"kythe.io/kythe/go/util/compare"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	spb "kythe.io/kythe/proto/storage_go_proto"
 )
diff --git a/kythe/go/storage/keyvalue/BUILD b/kythe/go/storage/keyvalue/BUILD
index 2566f8349..b4f67a541 100644
--- a/kythe/go/storage/keyvalue/BUILD
+++ b/kythe/go/storage/keyvalue/BUILD
@@ -20,6 +20,6 @@ go_test(
     visibility = ["//visibility:private"],
     deps = [
         "//kythe/proto:storage_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/storage/table/BUILD b/kythe/go/storage/table/BUILD
index 0dd332d65..964c02794 100644
--- a/kythe/go/storage/table/BUILD
+++ b/kythe/go/storage/table/BUILD
@@ -7,6 +7,6 @@ go_library(
     srcs = ["table.go"],
     deps = [
         "//kythe/go/storage/keyvalue",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/storage/table/table.go b/kythe/go/storage/table/table.go
index 0abd6548e..a099f6c99 100644
--- a/kythe/go/storage/table/table.go
+++ b/kythe/go/storage/table/table.go
@@ -25,7 +25,7 @@ import (
 
 	"kythe.io/kythe/go/storage/keyvalue"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // Proto is a key-value direct lookup table with protobuf values.
diff --git a/kythe/go/util/compare/BUILD b/kythe/go/util/compare/BUILD
index 5c308ea29..04dd87856 100644
--- a/kythe/go/util/compare/BUILD
+++ b/kythe/go/util/compare/BUILD
@@ -7,7 +7,7 @@ go_library(
     srcs = ["compare.go"],
     deps = [
         "//kythe/proto:storage_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
         "@com_github_google_go_cmp//cmp:go_default_library",
     ],
 )
diff --git a/kythe/go/util/compare/compare.go b/kythe/go/util/compare/compare.go
index 25d19eb71..7ae1bf6c9 100644
--- a/kythe/go/util/compare/compare.go
+++ b/kythe/go/util/compare/compare.go
@@ -22,8 +22,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/google/go-cmp/cmp"
+	"google.golang.org/protobuf/proto"
 
 	spb "kythe.io/kythe/proto/storage_go_proto"
 )
@@ -266,7 +266,9 @@ func (s *ByEntries) Pop() interface{} {
 
 // ValueEntries reports whether e1 is LT, GT, or EQ to e2 in entry order,
 // including fact values (if any).
-func ValueEntries(e1, e2 *spb.Entry) Order { return Entries(e1, e2).AndThen(e1.FactValue, e2.FactValue) }
+func ValueEntries(e1, e2 *spb.Entry) Order {
+	return Entries(e1, e2).AndThen(e1.FactValue, e2.FactValue)
+}
 
 // EntriesEqual reports whether e1 and e2 are equivalent, including their fact
 // values (if any).
diff --git a/kythe/go/util/kytheuri/BUILD b/kythe/go/util/kytheuri/BUILD
index 2a0338aba..81ae17fdc 100644
--- a/kythe/go/util/kytheuri/BUILD
+++ b/kythe/go/util/kytheuri/BUILD
@@ -24,6 +24,6 @@ go_test(
     visibility = ["//visibility:private"],
     deps = [
         "//kythe/proto:storage_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/util/reduce/BUILD b/kythe/go/util/reduce/BUILD
index 6c21626e1..4ce0ad170 100644
--- a/kythe/go/util/reduce/BUILD
+++ b/kythe/go/util/reduce/BUILD
@@ -11,7 +11,7 @@ go_library(
     deps = [
         "//kythe/go/util/disksort",
         "//kythe/proto:internal_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
 
diff --git a/kythe/go/util/reduce/reduce_sort.go b/kythe/go/util/reduce/reduce_sort.go
index 5fad282ec..92106cde4 100644
--- a/kythe/go/util/reduce/reduce_sort.go
+++ b/kythe/go/util/reduce/reduce_sort.go
@@ -24,7 +24,7 @@ import (
 
 	"kythe.io/kythe/go/util/disksort"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	ipb "kythe.io/kythe/proto/internal_go_proto"
 )
diff --git a/kythe/go/util/span/BUILD b/kythe/go/util/span/BUILD
index 5c3afb15e..71a5b517f 100644
--- a/kythe/go/util/span/BUILD
+++ b/kythe/go/util/span/BUILD
@@ -18,5 +18,5 @@ go_test(
     srcs = ["span_test.go"],
     library = "span",
     visibility = ["//visibility:private"],
-    deps = ["@com_github_golang_protobuf//proto:go_default_library"],
+    deps = ["@org_golang_google_protobuf//proto:go_default_library"],
 )
diff --git a/third_party/bazel/extra_actions_base_go_proto/extra_actions_base.pb.go b/third_party/bazel/extra_actions_base_go_proto/extra_actions_base.pb.go
index 82878e5d6..270d6355d 100644
--- a/third_party/bazel/extra_actions_base_go_proto/extra_actions_base.pb.go
+++ b/third_party/bazel/extra_actions_base_go_proto/extra_actions_base.pb.go
@@ -1,528 +1,452 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.22.0
+// 	protoc        v30.10.0
 // source: third_party/bazel/src/main/protobuf/extra_actions_base.proto
 
-package extra_actions_base_go_proto
+package blaze
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	proto "github.com/golang/protobuf/proto"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoiface "google.golang.org/protobuf/runtime/protoiface"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
 
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 type ExtraActionSummary struct {
-	Action               []*DetailedExtraActionInfo `protobuf:"bytes,1,rep,name=action" json:"action,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                   `json:"-"`
-	XXX_unrecognized     []byte                     `json:"-"`
-	XXX_sizecache        int32                      `json:"-"`
-}
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 
-func (m *ExtraActionSummary) Reset()         { *m = ExtraActionSummary{} }
-func (m *ExtraActionSummary) String() string { return proto.CompactTextString(m) }
-func (*ExtraActionSummary) ProtoMessage()    {}
-func (*ExtraActionSummary) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extra_actions_base_cd5af7b6b798b473, []int{0}
-}
-func (m *ExtraActionSummary) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ExtraActionSummary.Unmarshal(m, b)
-}
-func (m *ExtraActionSummary) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ExtraActionSummary.Marshal(b, m, deterministic)
+	Action []*DetailedExtraActionInfo `protobuf:"bytes,1,rep,name=action" json:"action,omitempty"`
 }
-func (dst *ExtraActionSummary) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExtraActionSummary.Merge(dst, src)
+
+func (x *ExtraActionSummary) Reset() {
+	*x = ExtraActionSummary{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
-func (m *ExtraActionSummary) XXX_Size() int {
-	return xxx_messageInfo_ExtraActionSummary.Size(m)
+
+func (x *ExtraActionSummary) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *ExtraActionSummary) XXX_DiscardUnknown() {
-	xxx_messageInfo_ExtraActionSummary.DiscardUnknown(m)
+
+func (*ExtraActionSummary) ProtoMessage() {}
+
+func (x *ExtraActionSummary) ProtoReflect() protoreflect.Message {
+	mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-var xxx_messageInfo_ExtraActionSummary proto.InternalMessageInfo
+// Deprecated: Use ExtraActionSummary.ProtoReflect.Descriptor instead.
+func (*ExtraActionSummary) Descriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescGZIP(), []int{0}
+}
 
-func (m *ExtraActionSummary) GetAction() []*DetailedExtraActionInfo {
-	if m != nil {
-		return m.Action
+func (x *ExtraActionSummary) GetAction() []*DetailedExtraActionInfo {
+	if x != nil {
+		return x.Action
 	}
 	return nil
 }
 
 type DetailedExtraActionInfo struct {
-	TriggeringFile       *string          `protobuf:"bytes,1,opt,name=triggering_file,json=triggeringFile" json:"triggering_file,omitempty"`
-	Action               *ExtraActionInfo `protobuf:"bytes,2,req,name=action" json:"action,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
-	XXX_unrecognized     []byte           `json:"-"`
-	XXX_sizecache        int32            `json:"-"`
-}
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 
-func (m *DetailedExtraActionInfo) Reset()         { *m = DetailedExtraActionInfo{} }
-func (m *DetailedExtraActionInfo) String() string { return proto.CompactTextString(m) }
-func (*DetailedExtraActionInfo) ProtoMessage()    {}
-func (*DetailedExtraActionInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extra_actions_base_cd5af7b6b798b473, []int{1}
+	TriggeringFile *string          `protobuf:"bytes,1,opt,name=triggering_file,json=triggeringFile" json:"triggering_file,omitempty"`
+	Action         *ExtraActionInfo `protobuf:"bytes,2,req,name=action" json:"action,omitempty"`
 }
-func (m *DetailedExtraActionInfo) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_DetailedExtraActionInfo.Unmarshal(m, b)
-}
-func (m *DetailedExtraActionInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_DetailedExtraActionInfo.Marshal(b, m, deterministic)
-}
-func (dst *DetailedExtraActionInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_DetailedExtraActionInfo.Merge(dst, src)
+
+func (x *DetailedExtraActionInfo) Reset() {
+	*x = DetailedExtraActionInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
-func (m *DetailedExtraActionInfo) XXX_Size() int {
-	return xxx_messageInfo_DetailedExtraActionInfo.Size(m)
+
+func (x *DetailedExtraActionInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *DetailedExtraActionInfo) XXX_DiscardUnknown() {
-	xxx_messageInfo_DetailedExtraActionInfo.DiscardUnknown(m)
+
+func (*DetailedExtraActionInfo) ProtoMessage() {}
+
+func (x *DetailedExtraActionInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-var xxx_messageInfo_DetailedExtraActionInfo proto.InternalMessageInfo
+// Deprecated: Use DetailedExtraActionInfo.ProtoReflect.Descriptor instead.
+func (*DetailedExtraActionInfo) Descriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescGZIP(), []int{1}
+}
 
-func (m *DetailedExtraActionInfo) GetTriggeringFile() string {
-	if m != nil && m.TriggeringFile != nil {
-		return *m.TriggeringFile
+func (x *DetailedExtraActionInfo) GetTriggeringFile() string {
+	if x != nil && x.TriggeringFile != nil {
+		return *x.TriggeringFile
 	}
 	return ""
 }
 
-func (m *DetailedExtraActionInfo) GetAction() *ExtraActionInfo {
-	if m != nil {
-		return m.Action
+func (x *DetailedExtraActionInfo) GetAction() *ExtraActionInfo {
+	if x != nil {
+		return x.Action
 	}
 	return nil
 }
 
 type ExtraActionInfo struct {
-	Owner                        *string                                `protobuf:"bytes,1,opt,name=owner" json:"owner,omitempty"`
-	AspectName                   *string                                `protobuf:"bytes,6,opt,name=aspect_name,json=aspectName" json:"aspect_name,omitempty"`                                                                                             // Deprecated: Do not use.
-	AspectParameters             map[string]*ExtraActionInfo_StringList `protobuf:"bytes,7,rep,name=aspect_parameters,json=aspectParameters" json:"aspect_parameters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"` // Deprecated: Do not use.
-	Aspects                      []*ExtraActionInfo_AspectDescriptor    `protobuf:"bytes,8,rep,name=aspects" json:"aspects,omitempty"`
-	Id                           *string                                `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
-	Mnemonic                     *string                                `protobuf:"bytes,5,opt,name=mnemonic" json:"mnemonic,omitempty"`
-	XXX_NoUnkeyedLiteral         struct{}                               `json:"-"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-	XXX_sizecache                int32  `json:"-"`
-}
-
-func (m *ExtraActionInfo) Reset()         { *m = ExtraActionInfo{} }
-func (m *ExtraActionInfo) String() string { return proto.CompactTextString(m) }
-func (*ExtraActionInfo) ProtoMessage()    {}
-func (*ExtraActionInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extra_actions_base_cd5af7b6b798b473, []int{2}
+	state           protoimpl.MessageState
+	sizeCache       protoimpl.SizeCache
+	unknownFields   protoimpl.UnknownFields
+	extensionFields protoimpl.ExtensionFields
+
+	Owner *string `protobuf:"bytes,1,opt,name=owner" json:"owner,omitempty"`
+	// Deprecated: Do not use.
+	AspectName *string `protobuf:"bytes,6,opt,name=aspect_name,json=aspectName" json:"aspect_name,omitempty"`
+	// Deprecated: Do not use.
+	AspectParameters map[string]*ExtraActionInfo_StringList `protobuf:"bytes,7,rep,name=aspect_parameters,json=aspectParameters" json:"aspect_parameters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+	Aspects          []*ExtraActionInfo_AspectDescriptor    `protobuf:"bytes,8,rep,name=aspects" json:"aspects,omitempty"`
+	Id               *string                                `protobuf:"bytes,2,opt,name=id" json:"id,omitempty"`
+	Mnemonic         *string                                `protobuf:"bytes,5,opt,name=mnemonic" json:"mnemonic,omitempty"`
+}
+
+func (x *ExtraActionInfo) Reset() {
+	*x = ExtraActionInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
 
-var extRange_ExtraActionInfo = []proto.ExtensionRange{
-	{Start: 1000, End: 536870911},
+func (x *ExtraActionInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
 
-func (*ExtraActionInfo) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_ExtraActionInfo
-}
-func (m *ExtraActionInfo) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ExtraActionInfo.Unmarshal(m, b)
-}
-func (m *ExtraActionInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ExtraActionInfo.Marshal(b, m, deterministic)
-}
-func (dst *ExtraActionInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExtraActionInfo.Merge(dst, src)
+func (*ExtraActionInfo) ProtoMessage() {}
+
+func (x *ExtraActionInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
-func (m *ExtraActionInfo) XXX_Size() int {
-	return xxx_messageInfo_ExtraActionInfo.Size(m)
+
+// Deprecated: Use ExtraActionInfo.ProtoReflect.Descriptor instead.
+func (*ExtraActionInfo) Descriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescGZIP(), []int{2}
 }
-func (m *ExtraActionInfo) XXX_DiscardUnknown() {
-	xxx_messageInfo_ExtraActionInfo.DiscardUnknown(m)
+
+var extRange_ExtraActionInfo = []protoiface.ExtensionRangeV1{
+	{Start: 1000, End: 536870911},
 }
 
-var xxx_messageInfo_ExtraActionInfo proto.InternalMessageInfo
+// Deprecated: Use ExtraActionInfo.ProtoReflect.Descriptor.ExtensionRanges instead.
+func (*ExtraActionInfo) ExtensionRangeArray() []protoiface.ExtensionRangeV1 {
+	return extRange_ExtraActionInfo
+}
 
-func (m *ExtraActionInfo) GetOwner() string {
-	if m != nil && m.Owner != nil {
-		return *m.Owner
+func (x *ExtraActionInfo) GetOwner() string {
+	if x != nil && x.Owner != nil {
+		return *x.Owner
 	}
 	return ""
 }
 
 // Deprecated: Do not use.
-func (m *ExtraActionInfo) GetAspectName() string {
-	if m != nil && m.AspectName != nil {
-		return *m.AspectName
+func (x *ExtraActionInfo) GetAspectName() string {
+	if x != nil && x.AspectName != nil {
+		return *x.AspectName
 	}
 	return ""
 }
 
 // Deprecated: Do not use.
-func (m *ExtraActionInfo) GetAspectParameters() map[string]*ExtraActionInfo_StringList {
-	if m != nil {
-		return m.AspectParameters
+func (x *ExtraActionInfo) GetAspectParameters() map[string]*ExtraActionInfo_StringList {
+	if x != nil {
+		return x.AspectParameters
 	}
 	return nil
 }
 
-func (m *ExtraActionInfo) GetAspects() []*ExtraActionInfo_AspectDescriptor {
-	if m != nil {
-		return m.Aspects
+func (x *ExtraActionInfo) GetAspects() []*ExtraActionInfo_AspectDescriptor {
+	if x != nil {
+		return x.Aspects
 	}
 	return nil
 }
 
-func (m *ExtraActionInfo) GetId() string {
-	if m != nil && m.Id != nil {
-		return *m.Id
+func (x *ExtraActionInfo) GetId() string {
+	if x != nil && x.Id != nil {
+		return *x.Id
 	}
 	return ""
 }
 
-func (m *ExtraActionInfo) GetMnemonic() string {
-	if m != nil && m.Mnemonic != nil {
-		return *m.Mnemonic
+func (x *ExtraActionInfo) GetMnemonic() string {
+	if x != nil && x.Mnemonic != nil {
+		return *x.Mnemonic
 	}
 	return ""
 }
 
-// Deprecated: Do not use.
-type ExtraActionInfo_StringList struct {
-	Value                []string `protobuf:"bytes,1,rep,name=value" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
+type EnvironmentVariable struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
 
-func (m *ExtraActionInfo_StringList) Reset()         { *m = ExtraActionInfo_StringList{} }
-func (m *ExtraActionInfo_StringList) String() string { return proto.CompactTextString(m) }
-func (*ExtraActionInfo_StringList) ProtoMessage()    {}
-func (*ExtraActionInfo_StringList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extra_actions_base_cd5af7b6b798b473, []int{2, 1}
-}
-func (m *ExtraActionInfo_StringList) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ExtraActionInfo_StringList.Unmarshal(m, b)
-}
-func (m *ExtraActionInfo_StringList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ExtraActionInfo_StringList.Marshal(b, m, deterministic)
-}
-func (dst *ExtraActionInfo_StringList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExtraActionInfo_StringList.Merge(dst, src)
-}
-func (m *ExtraActionInfo_StringList) XXX_Size() int {
-	return xxx_messageInfo_ExtraActionInfo_StringList.Size(m)
+	Name  *string `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
+	Value *string `protobuf:"bytes,2,req,name=value" json:"value,omitempty"`
 }
-func (m *ExtraActionInfo_StringList) XXX_DiscardUnknown() {
-	xxx_messageInfo_ExtraActionInfo_StringList.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ExtraActionInfo_StringList proto.InternalMessageInfo
 
-func (m *ExtraActionInfo_StringList) GetValue() []string {
-	if m != nil {
-		return m.Value
+func (x *EnvironmentVariable) Reset() {
+	*x = EnvironmentVariable{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
 	}
-	return nil
 }
 
-type ExtraActionInfo_AspectDescriptor struct {
-	AspectName           *string                                                 `protobuf:"bytes,1,opt,name=aspect_name,json=aspectName" json:"aspect_name,omitempty"`
-	AspectParameters     map[string]*ExtraActionInfo_AspectDescriptor_StringList `protobuf:"bytes,2,rep,name=aspect_parameters,json=aspectParameters" json:"aspect_parameters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	XXX_NoUnkeyedLiteral struct{}                                                `json:"-"`
-	XXX_unrecognized     []byte                                                  `json:"-"`
-	XXX_sizecache        int32                                                   `json:"-"`
+func (x *EnvironmentVariable) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
 
-func (m *ExtraActionInfo_AspectDescriptor) Reset()         { *m = ExtraActionInfo_AspectDescriptor{} }
-func (m *ExtraActionInfo_AspectDescriptor) String() string { return proto.CompactTextString(m) }
-func (*ExtraActionInfo_AspectDescriptor) ProtoMessage()    {}
-func (*ExtraActionInfo_AspectDescriptor) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extra_actions_base_cd5af7b6b798b473, []int{2, 2}
-}
-func (m *ExtraActionInfo_AspectDescriptor) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ExtraActionInfo_AspectDescriptor.Unmarshal(m, b)
-}
-func (m *ExtraActionInfo_AspectDescriptor) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ExtraActionInfo_AspectDescriptor.Marshal(b, m, deterministic)
-}
-func (dst *ExtraActionInfo_AspectDescriptor) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExtraActionInfo_AspectDescriptor.Merge(dst, src)
-}
-func (m *ExtraActionInfo_AspectDescriptor) XXX_Size() int {
-	return xxx_messageInfo_ExtraActionInfo_AspectDescriptor.Size(m)
-}
-func (m *ExtraActionInfo_AspectDescriptor) XXX_DiscardUnknown() {
-	xxx_messageInfo_ExtraActionInfo_AspectDescriptor.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ExtraActionInfo_AspectDescriptor proto.InternalMessageInfo
-
-func (m *ExtraActionInfo_AspectDescriptor) GetAspectName() string {
-	if m != nil && m.AspectName != nil {
-		return *m.AspectName
-	}
-	return ""
-}
+func (*EnvironmentVariable) ProtoMessage() {}
 
-func (m *ExtraActionInfo_AspectDescriptor) GetAspectParameters() map[string]*ExtraActionInfo_AspectDescriptor_StringList {
-	if m != nil {
-		return m.AspectParameters
+func (x *EnvironmentVariable) ProtoReflect() protoreflect.Message {
+	mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
 	}
-	return nil
+	return mi.MessageOf(x)
 }
 
-type ExtraActionInfo_AspectDescriptor_StringList struct {
-	Value                []string `protobuf:"bytes,1,rep,name=value" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+// Deprecated: Use EnvironmentVariable.ProtoReflect.Descriptor instead.
+func (*EnvironmentVariable) Descriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescGZIP(), []int{3}
 }
 
-func (m *ExtraActionInfo_AspectDescriptor_StringList) Reset() {
-	*m = ExtraActionInfo_AspectDescriptor_StringList{}
-}
-func (m *ExtraActionInfo_AspectDescriptor_StringList) String() string {
-	return proto.CompactTextString(m)
-}
-func (*ExtraActionInfo_AspectDescriptor_StringList) ProtoMessage() {}
-func (*ExtraActionInfo_AspectDescriptor_StringList) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extra_actions_base_cd5af7b6b798b473, []int{2, 2, 1}
-}
-func (m *ExtraActionInfo_AspectDescriptor_StringList) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ExtraActionInfo_AspectDescriptor_StringList.Unmarshal(m, b)
-}
-func (m *ExtraActionInfo_AspectDescriptor_StringList) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ExtraActionInfo_AspectDescriptor_StringList.Marshal(b, m, deterministic)
-}
-func (dst *ExtraActionInfo_AspectDescriptor_StringList) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExtraActionInfo_AspectDescriptor_StringList.Merge(dst, src)
-}
-func (m *ExtraActionInfo_AspectDescriptor_StringList) XXX_Size() int {
-	return xxx_messageInfo_ExtraActionInfo_AspectDescriptor_StringList.Size(m)
-}
-func (m *ExtraActionInfo_AspectDescriptor_StringList) XXX_DiscardUnknown() {
-	xxx_messageInfo_ExtraActionInfo_AspectDescriptor_StringList.DiscardUnknown(m)
+func (x *EnvironmentVariable) GetName() string {
+	if x != nil && x.Name != nil {
+		return *x.Name
+	}
+	return ""
 }
 
-var xxx_messageInfo_ExtraActionInfo_AspectDescriptor_StringList proto.InternalMessageInfo
-
-func (m *ExtraActionInfo_AspectDescriptor_StringList) GetValue() []string {
-	if m != nil {
-		return m.Value
+func (x *EnvironmentVariable) GetValue() string {
+	if x != nil && x.Value != nil {
+		return *x.Value
 	}
-	return nil
+	return ""
 }
 
-type EnvironmentVariable struct {
-	Name                 *string  `protobuf:"bytes,1,req,name=name" json:"name,omitempty"`
-	Value                *string  `protobuf:"bytes,2,req,name=value" json:"value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+type SpawnInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Argument   []string               `protobuf:"bytes,1,rep,name=argument" json:"argument,omitempty"`
+	Variable   []*EnvironmentVariable `protobuf:"bytes,2,rep,name=variable" json:"variable,omitempty"`
+	InputFile  []string               `protobuf:"bytes,4,rep,name=input_file,json=inputFile" json:"input_file,omitempty"`
+	OutputFile []string               `protobuf:"bytes,5,rep,name=output_file,json=outputFile" json:"output_file,omitempty"`
+}
+
+func (x *SpawnInfo) Reset() {
+	*x = SpawnInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
 
-func (m *EnvironmentVariable) Reset()         { *m = EnvironmentVariable{} }
-func (m *EnvironmentVariable) String() string { return proto.CompactTextString(m) }
-func (*EnvironmentVariable) ProtoMessage()    {}
-func (*EnvironmentVariable) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extra_actions_base_cd5af7b6b798b473, []int{3}
-}
-func (m *EnvironmentVariable) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_EnvironmentVariable.Unmarshal(m, b)
-}
-func (m *EnvironmentVariable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_EnvironmentVariable.Marshal(b, m, deterministic)
-}
-func (dst *EnvironmentVariable) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EnvironmentVariable.Merge(dst, src)
+func (x *SpawnInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *EnvironmentVariable) XXX_Size() int {
-	return xxx_messageInfo_EnvironmentVariable.Size(m)
-}
-func (m *EnvironmentVariable) XXX_DiscardUnknown() {
-	xxx_messageInfo_EnvironmentVariable.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_EnvironmentVariable proto.InternalMessageInfo
 
-func (m *EnvironmentVariable) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
+func (*SpawnInfo) ProtoMessage() {}
 
-func (m *EnvironmentVariable) GetValue() string {
-	if m != nil && m.Value != nil {
-		return *m.Value
+func (x *SpawnInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
 	}
-	return ""
+	return mi.MessageOf(x)
 }
 
-type SpawnInfo struct {
-	Argument             []string               `protobuf:"bytes,1,rep,name=argument" json:"argument,omitempty"`
-	Variable             []*EnvironmentVariable `protobuf:"bytes,2,rep,name=variable" json:"variable,omitempty"`
-	InputFile            []string               `protobuf:"bytes,4,rep,name=input_file,json=inputFile" json:"input_file,omitempty"`
-	OutputFile           []string               `protobuf:"bytes,5,rep,name=output_file,json=outputFile" json:"output_file,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
-	XXX_unrecognized     []byte                 `json:"-"`
-	XXX_sizecache        int32                  `json:"-"`
-}
-
-func (m *SpawnInfo) Reset()         { *m = SpawnInfo{} }
-func (m *SpawnInfo) String() string { return proto.CompactTextString(m) }
-func (*SpawnInfo) ProtoMessage()    {}
+// Deprecated: Use SpawnInfo.ProtoReflect.Descriptor instead.
 func (*SpawnInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extra_actions_base_cd5af7b6b798b473, []int{4}
-}
-func (m *SpawnInfo) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_SpawnInfo.Unmarshal(m, b)
-}
-func (m *SpawnInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_SpawnInfo.Marshal(b, m, deterministic)
-}
-func (dst *SpawnInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SpawnInfo.Merge(dst, src)
-}
-func (m *SpawnInfo) XXX_Size() int {
-	return xxx_messageInfo_SpawnInfo.Size(m)
-}
-func (m *SpawnInfo) XXX_DiscardUnknown() {
-	xxx_messageInfo_SpawnInfo.DiscardUnknown(m)
+	return file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescGZIP(), []int{4}
 }
 
-var xxx_messageInfo_SpawnInfo proto.InternalMessageInfo
-
-func (m *SpawnInfo) GetArgument() []string {
-	if m != nil {
-		return m.Argument
+func (x *SpawnInfo) GetArgument() []string {
+	if x != nil {
+		return x.Argument
 	}
 	return nil
 }
 
-func (m *SpawnInfo) GetVariable() []*EnvironmentVariable {
-	if m != nil {
-		return m.Variable
+func (x *SpawnInfo) GetVariable() []*EnvironmentVariable {
+	if x != nil {
+		return x.Variable
 	}
 	return nil
 }
 
-func (m *SpawnInfo) GetInputFile() []string {
-	if m != nil {
-		return m.InputFile
+func (x *SpawnInfo) GetInputFile() []string {
+	if x != nil {
+		return x.InputFile
 	}
 	return nil
 }
 
-func (m *SpawnInfo) GetOutputFile() []string {
-	if m != nil {
-		return m.OutputFile
+func (x *SpawnInfo) GetOutputFile() []string {
+	if x != nil {
+		return x.OutputFile
 	}
 	return nil
 }
 
-var E_SpawnInfo_SpawnInfo = &proto.ExtensionDesc{
-	ExtendedType:  (*ExtraActionInfo)(nil),
-	ExtensionType: (*SpawnInfo)(nil),
-	Field:         1003,
-	Name:          "blaze.SpawnInfo.spawn_info",
-	Tag:           "bytes,1003,opt,name=spawn_info,json=spawnInfo",
-	Filename:      "third_party/bazel/src/main/protobuf/extra_actions_base.proto",
-}
-
 type CppCompileInfo struct {
-	Tool                 *string                `protobuf:"bytes,1,opt,name=tool" json:"tool,omitempty"`
-	CompilerOption       []string               `protobuf:"bytes,2,rep,name=compiler_option,json=compilerOption" json:"compiler_option,omitempty"`
-	SourceFile           *string                `protobuf:"bytes,3,opt,name=source_file,json=sourceFile" json:"source_file,omitempty"`
-	OutputFile           *string                `protobuf:"bytes,4,opt,name=output_file,json=outputFile" json:"output_file,omitempty"`
-	SourcesAndHeaders    []string               `protobuf:"bytes,5,rep,name=sources_and_headers,json=sourcesAndHeaders" json:"sources_and_headers,omitempty"`
-	Variable             []*EnvironmentVariable `protobuf:"bytes,6,rep,name=variable" json:"variable,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
-	XXX_unrecognized     []byte                 `json:"-"`
-	XXX_sizecache        int32                  `json:"-"`
-}
-
-func (m *CppCompileInfo) Reset()         { *m = CppCompileInfo{} }
-func (m *CppCompileInfo) String() string { return proto.CompactTextString(m) }
-func (*CppCompileInfo) ProtoMessage()    {}
-func (*CppCompileInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extra_actions_base_cd5af7b6b798b473, []int{5}
-}
-func (m *CppCompileInfo) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_CppCompileInfo.Unmarshal(m, b)
-}
-func (m *CppCompileInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_CppCompileInfo.Marshal(b, m, deterministic)
-}
-func (dst *CppCompileInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CppCompileInfo.Merge(dst, src)
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Tool              *string                `protobuf:"bytes,1,opt,name=tool" json:"tool,omitempty"`
+	CompilerOption    []string               `protobuf:"bytes,2,rep,name=compiler_option,json=compilerOption" json:"compiler_option,omitempty"`
+	SourceFile        *string                `protobuf:"bytes,3,opt,name=source_file,json=sourceFile" json:"source_file,omitempty"`
+	OutputFile        *string                `protobuf:"bytes,4,opt,name=output_file,json=outputFile" json:"output_file,omitempty"`
+	SourcesAndHeaders []string               `protobuf:"bytes,5,rep,name=sources_and_headers,json=sourcesAndHeaders" json:"sources_and_headers,omitempty"`
+	Variable          []*EnvironmentVariable `protobuf:"bytes,6,rep,name=variable" json:"variable,omitempty"`
+}
+
+func (x *CppCompileInfo) Reset() {
+	*x = CppCompileInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
-func (m *CppCompileInfo) XXX_Size() int {
-	return xxx_messageInfo_CppCompileInfo.Size(m)
+
+func (x *CppCompileInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *CppCompileInfo) XXX_DiscardUnknown() {
-	xxx_messageInfo_CppCompileInfo.DiscardUnknown(m)
+
+func (*CppCompileInfo) ProtoMessage() {}
+
+func (x *CppCompileInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-var xxx_messageInfo_CppCompileInfo proto.InternalMessageInfo
+// Deprecated: Use CppCompileInfo.ProtoReflect.Descriptor instead.
+func (*CppCompileInfo) Descriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescGZIP(), []int{5}
+}
 
-func (m *CppCompileInfo) GetTool() string {
-	if m != nil && m.Tool != nil {
-		return *m.Tool
+func (x *CppCompileInfo) GetTool() string {
+	if x != nil && x.Tool != nil {
+		return *x.Tool
 	}
 	return ""
 }
 
-func (m *CppCompileInfo) GetCompilerOption() []string {
-	if m != nil {
-		return m.CompilerOption
+func (x *CppCompileInfo) GetCompilerOption() []string {
+	if x != nil {
+		return x.CompilerOption
 	}
 	return nil
 }
 
-func (m *CppCompileInfo) GetSourceFile() string {
-	if m != nil && m.SourceFile != nil {
-		return *m.SourceFile
+func (x *CppCompileInfo) GetSourceFile() string {
+	if x != nil && x.SourceFile != nil {
+		return *x.SourceFile
 	}
 	return ""
 }
 
-func (m *CppCompileInfo) GetOutputFile() string {
-	if m != nil && m.OutputFile != nil {
-		return *m.OutputFile
+func (x *CppCompileInfo) GetOutputFile() string {
+	if x != nil && x.OutputFile != nil {
+		return *x.OutputFile
 	}
 	return ""
 }
 
-func (m *CppCompileInfo) GetSourcesAndHeaders() []string {
-	if m != nil {
-		return m.SourcesAndHeaders
+func (x *CppCompileInfo) GetSourcesAndHeaders() []string {
+	if x != nil {
+		return x.SourcesAndHeaders
 	}
 	return nil
 }
 
-func (m *CppCompileInfo) GetVariable() []*EnvironmentVariable {
-	if m != nil {
-		return m.Variable
+func (x *CppCompileInfo) GetVariable() []*EnvironmentVariable {
+	if x != nil {
+		return x.Variable
 	}
 	return nil
 }
 
-var E_CppCompileInfo_CppCompileInfo = &proto.ExtensionDesc{
-	ExtendedType:  (*ExtraActionInfo)(nil),
-	ExtensionType: (*CppCompileInfo)(nil),
-	Field:         1001,
-	Name:          "blaze.CppCompileInfo.cpp_compile_info",
-	Tag:           "bytes,1001,opt,name=cpp_compile_info,json=cppCompileInfo",
-	Filename:      "third_party/bazel/src/main/protobuf/extra_actions_base.proto",
-}
-
 type CppLinkInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	InputFile               []string `protobuf:"bytes,1,rep,name=input_file,json=inputFile" json:"input_file,omitempty"`
 	OutputFile              *string  `protobuf:"bytes,2,opt,name=output_file,json=outputFile" json:"output_file,omitempty"`
 	InterfaceOutputFile     *string  `protobuf:"bytes,3,opt,name=interface_output_file,json=interfaceOutputFile" json:"interface_output_file,omitempty"`
@@ -531,359 +455,868 @@ type CppLinkInfo struct {
 	LinkStamp               []string `protobuf:"bytes,6,rep,name=link_stamp,json=linkStamp" json:"link_stamp,omitempty"`
 	BuildInfoHeaderArtifact []string `protobuf:"bytes,7,rep,name=build_info_header_artifact,json=buildInfoHeaderArtifact" json:"build_info_header_artifact,omitempty"`
 	LinkOpt                 []string `protobuf:"bytes,8,rep,name=link_opt,json=linkOpt" json:"link_opt,omitempty"`
-	XXX_NoUnkeyedLiteral    struct{} `json:"-"`
-	XXX_unrecognized        []byte   `json:"-"`
-	XXX_sizecache           int32    `json:"-"`
 }
 
-func (m *CppLinkInfo) Reset()         { *m = CppLinkInfo{} }
-func (m *CppLinkInfo) String() string { return proto.CompactTextString(m) }
-func (*CppLinkInfo) ProtoMessage()    {}
-func (*CppLinkInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extra_actions_base_cd5af7b6b798b473, []int{6}
-}
-func (m *CppLinkInfo) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_CppLinkInfo.Unmarshal(m, b)
-}
-func (m *CppLinkInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_CppLinkInfo.Marshal(b, m, deterministic)
-}
-func (dst *CppLinkInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CppLinkInfo.Merge(dst, src)
+func (x *CppLinkInfo) Reset() {
+	*x = CppLinkInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
-func (m *CppLinkInfo) XXX_Size() int {
-	return xxx_messageInfo_CppLinkInfo.Size(m)
+
+func (x *CppLinkInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *CppLinkInfo) XXX_DiscardUnknown() {
-	xxx_messageInfo_CppLinkInfo.DiscardUnknown(m)
+
+func (*CppLinkInfo) ProtoMessage() {}
+
+func (x *CppLinkInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-var xxx_messageInfo_CppLinkInfo proto.InternalMessageInfo
+// Deprecated: Use CppLinkInfo.ProtoReflect.Descriptor instead.
+func (*CppLinkInfo) Descriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescGZIP(), []int{6}
+}
 
-func (m *CppLinkInfo) GetInputFile() []string {
-	if m != nil {
-		return m.InputFile
+func (x *CppLinkInfo) GetInputFile() []string {
+	if x != nil {
+		return x.InputFile
 	}
 	return nil
 }
 
-func (m *CppLinkInfo) GetOutputFile() string {
-	if m != nil && m.OutputFile != nil {
-		return *m.OutputFile
+func (x *CppLinkInfo) GetOutputFile() string {
+	if x != nil && x.OutputFile != nil {
+		return *x.OutputFile
 	}
 	return ""
 }
 
-func (m *CppLinkInfo) GetInterfaceOutputFile() string {
-	if m != nil && m.InterfaceOutputFile != nil {
-		return *m.InterfaceOutputFile
+func (x *CppLinkInfo) GetInterfaceOutputFile() string {
+	if x != nil && x.InterfaceOutputFile != nil {
+		return *x.InterfaceOutputFile
 	}
 	return ""
 }
 
-func (m *CppLinkInfo) GetLinkTargetType() string {
-	if m != nil && m.LinkTargetType != nil {
-		return *m.LinkTargetType
+func (x *CppLinkInfo) GetLinkTargetType() string {
+	if x != nil && x.LinkTargetType != nil {
+		return *x.LinkTargetType
 	}
 	return ""
 }
 
-func (m *CppLinkInfo) GetLinkStaticness() string {
-	if m != nil && m.LinkStaticness != nil {
-		return *m.LinkStaticness
+func (x *CppLinkInfo) GetLinkStaticness() string {
+	if x != nil && x.LinkStaticness != nil {
+		return *x.LinkStaticness
 	}
 	return ""
 }
 
-func (m *CppLinkInfo) GetLinkStamp() []string {
-	if m != nil {
-		return m.LinkStamp
+func (x *CppLinkInfo) GetLinkStamp() []string {
+	if x != nil {
+		return x.LinkStamp
 	}
 	return nil
 }
 
-func (m *CppLinkInfo) GetBuildInfoHeaderArtifact() []string {
-	if m != nil {
-		return m.BuildInfoHeaderArtifact
+func (x *CppLinkInfo) GetBuildInfoHeaderArtifact() []string {
+	if x != nil {
+		return x.BuildInfoHeaderArtifact
 	}
 	return nil
 }
 
-func (m *CppLinkInfo) GetLinkOpt() []string {
-	if m != nil {
-		return m.LinkOpt
+func (x *CppLinkInfo) GetLinkOpt() []string {
+	if x != nil {
+		return x.LinkOpt
 	}
 	return nil
 }
 
-var E_CppLinkInfo_CppLinkInfo = &proto.ExtensionDesc{
-	ExtendedType:  (*ExtraActionInfo)(nil),
-	ExtensionType: (*CppLinkInfo)(nil),
-	Field:         1002,
-	Name:          "blaze.CppLinkInfo.cpp_link_info",
-	Tag:           "bytes,1002,opt,name=cpp_link_info,json=cppLinkInfo",
-	Filename:      "third_party/bazel/src/main/protobuf/extra_actions_base.proto",
-}
-
 type JavaCompileInfo struct {
-	Outputjar            *string  `protobuf:"bytes,1,opt,name=outputjar" json:"outputjar,omitempty"`
-	Classpath            []string `protobuf:"bytes,2,rep,name=classpath" json:"classpath,omitempty"`
-	Sourcepath           []string `protobuf:"bytes,3,rep,name=sourcepath" json:"sourcepath,omitempty"`
-	SourceFile           []string `protobuf:"bytes,4,rep,name=source_file,json=sourceFile" json:"source_file,omitempty"`
-	JavacOpt             []string `protobuf:"bytes,5,rep,name=javac_opt,json=javacOpt" json:"javac_opt,omitempty"`
-	Processor            []string `protobuf:"bytes,6,rep,name=processor" json:"processor,omitempty"`
-	Processorpath        []string `protobuf:"bytes,7,rep,name=processorpath" json:"processorpath,omitempty"`
-	Bootclasspath        []string `protobuf:"bytes,8,rep,name=bootclasspath" json:"bootclasspath,omitempty"`
-	Argument             []string `protobuf:"bytes,9,rep,name=argument" json:"argument,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
-}
-
-func (m *JavaCompileInfo) Reset()         { *m = JavaCompileInfo{} }
-func (m *JavaCompileInfo) String() string { return proto.CompactTextString(m) }
-func (*JavaCompileInfo) ProtoMessage()    {}
-func (*JavaCompileInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extra_actions_base_cd5af7b6b798b473, []int{7}
-}
-func (m *JavaCompileInfo) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_JavaCompileInfo.Unmarshal(m, b)
-}
-func (m *JavaCompileInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_JavaCompileInfo.Marshal(b, m, deterministic)
-}
-func (dst *JavaCompileInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_JavaCompileInfo.Merge(dst, src)
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Outputjar     *string  `protobuf:"bytes,1,opt,name=outputjar" json:"outputjar,omitempty"`
+	Classpath     []string `protobuf:"bytes,2,rep,name=classpath" json:"classpath,omitempty"`
+	Sourcepath    []string `protobuf:"bytes,3,rep,name=sourcepath" json:"sourcepath,omitempty"`
+	SourceFile    []string `protobuf:"bytes,4,rep,name=source_file,json=sourceFile" json:"source_file,omitempty"`
+	JavacOpt      []string `protobuf:"bytes,5,rep,name=javac_opt,json=javacOpt" json:"javac_opt,omitempty"`
+	Processor     []string `protobuf:"bytes,6,rep,name=processor" json:"processor,omitempty"`
+	Processorpath []string `protobuf:"bytes,7,rep,name=processorpath" json:"processorpath,omitempty"`
+	Bootclasspath []string `protobuf:"bytes,8,rep,name=bootclasspath" json:"bootclasspath,omitempty"`
+	Argument      []string `protobuf:"bytes,9,rep,name=argument" json:"argument,omitempty"`
+}
+
+func (x *JavaCompileInfo) Reset() {
+	*x = JavaCompileInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
-func (m *JavaCompileInfo) XXX_Size() int {
-	return xxx_messageInfo_JavaCompileInfo.Size(m)
+
+func (x *JavaCompileInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
-func (m *JavaCompileInfo) XXX_DiscardUnknown() {
-	xxx_messageInfo_JavaCompileInfo.DiscardUnknown(m)
+
+func (*JavaCompileInfo) ProtoMessage() {}
+
+func (x *JavaCompileInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-var xxx_messageInfo_JavaCompileInfo proto.InternalMessageInfo
+// Deprecated: Use JavaCompileInfo.ProtoReflect.Descriptor instead.
+func (*JavaCompileInfo) Descriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescGZIP(), []int{7}
+}
 
-func (m *JavaCompileInfo) GetOutputjar() string {
-	if m != nil && m.Outputjar != nil {
-		return *m.Outputjar
+func (x *JavaCompileInfo) GetOutputjar() string {
+	if x != nil && x.Outputjar != nil {
+		return *x.Outputjar
 	}
 	return ""
 }
 
-func (m *JavaCompileInfo) GetClasspath() []string {
-	if m != nil {
-		return m.Classpath
+func (x *JavaCompileInfo) GetClasspath() []string {
+	if x != nil {
+		return x.Classpath
 	}
 	return nil
 }
 
-func (m *JavaCompileInfo) GetSourcepath() []string {
-	if m != nil {
-		return m.Sourcepath
+func (x *JavaCompileInfo) GetSourcepath() []string {
+	if x != nil {
+		return x.Sourcepath
 	}
 	return nil
 }
 
-func (m *JavaCompileInfo) GetSourceFile() []string {
-	if m != nil {
-		return m.SourceFile
+func (x *JavaCompileInfo) GetSourceFile() []string {
+	if x != nil {
+		return x.SourceFile
 	}
 	return nil
 }
 
-func (m *JavaCompileInfo) GetJavacOpt() []string {
-	if m != nil {
-		return m.JavacOpt
+func (x *JavaCompileInfo) GetJavacOpt() []string {
+	if x != nil {
+		return x.JavacOpt
 	}
 	return nil
 }
 
-func (m *JavaCompileInfo) GetProcessor() []string {
-	if m != nil {
-		return m.Processor
+func (x *JavaCompileInfo) GetProcessor() []string {
+	if x != nil {
+		return x.Processor
 	}
 	return nil
 }
 
-func (m *JavaCompileInfo) GetProcessorpath() []string {
-	if m != nil {
-		return m.Processorpath
+func (x *JavaCompileInfo) GetProcessorpath() []string {
+	if x != nil {
+		return x.Processorpath
 	}
 	return nil
 }
 
-func (m *JavaCompileInfo) GetBootclasspath() []string {
-	if m != nil {
-		return m.Bootclasspath
+func (x *JavaCompileInfo) GetBootclasspath() []string {
+	if x != nil {
+		return x.Bootclasspath
 	}
 	return nil
 }
 
-func (m *JavaCompileInfo) GetArgument() []string {
-	if m != nil {
-		return m.Argument
+func (x *JavaCompileInfo) GetArgument() []string {
+	if x != nil {
+		return x.Argument
 	}
 	return nil
 }
 
-var E_JavaCompileInfo_JavaCompileInfo = &proto.ExtensionDesc{
-	ExtendedType:  (*ExtraActionInfo)(nil),
-	ExtensionType: (*JavaCompileInfo)(nil),
-	Field:         1000,
-	Name:          "blaze.JavaCompileInfo.java_compile_info",
-	Tag:           "bytes,1000,opt,name=java_compile_info,json=javaCompileInfo",
-	Filename:      "third_party/bazel/src/main/protobuf/extra_actions_base.proto",
+type PythonInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	SourceFile []string `protobuf:"bytes,1,rep,name=source_file,json=sourceFile" json:"source_file,omitempty"`
+	DepFile    []string `protobuf:"bytes,2,rep,name=dep_file,json=depFile" json:"dep_file,omitempty"`
 }
 
-type PythonInfo struct {
-	SourceFile           []string `protobuf:"bytes,1,rep,name=source_file,json=sourceFile" json:"source_file,omitempty"`
-	DepFile              []string `protobuf:"bytes,2,rep,name=dep_file,json=depFile" json:"dep_file,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+func (x *PythonInfo) Reset() {
+	*x = PythonInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PythonInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
 }
 
-func (m *PythonInfo) Reset()         { *m = PythonInfo{} }
-func (m *PythonInfo) String() string { return proto.CompactTextString(m) }
-func (*PythonInfo) ProtoMessage()    {}
+func (*PythonInfo) ProtoMessage() {}
+
+func (x *PythonInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[8]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PythonInfo.ProtoReflect.Descriptor instead.
 func (*PythonInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_extra_actions_base_cd5af7b6b798b473, []int{8}
+	return file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescGZIP(), []int{8}
 }
-func (m *PythonInfo) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_PythonInfo.Unmarshal(m, b)
+
+func (x *PythonInfo) GetSourceFile() []string {
+	if x != nil {
+		return x.SourceFile
+	}
+	return nil
 }
-func (m *PythonInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_PythonInfo.Marshal(b, m, deterministic)
+
+func (x *PythonInfo) GetDepFile() []string {
+	if x != nil {
+		return x.DepFile
+	}
+	return nil
 }
-func (dst *PythonInfo) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_PythonInfo.Merge(dst, src)
+
+// Deprecated: Do not use.
+type ExtraActionInfo_StringList struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Value []string `protobuf:"bytes,1,rep,name=value" json:"value,omitempty"`
 }
-func (m *PythonInfo) XXX_Size() int {
-	return xxx_messageInfo_PythonInfo.Size(m)
+
+func (x *ExtraActionInfo_StringList) Reset() {
+	*x = ExtraActionInfo_StringList{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[10]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
 }
-func (m *PythonInfo) XXX_DiscardUnknown() {
-	xxx_messageInfo_PythonInfo.DiscardUnknown(m)
+
+func (x *ExtraActionInfo_StringList) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExtraActionInfo_StringList) ProtoMessage() {}
+
+func (x *ExtraActionInfo_StringList) ProtoReflect() protoreflect.Message {
+	mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[10]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
 }
 
-var xxx_messageInfo_PythonInfo proto.InternalMessageInfo
+// Deprecated: Use ExtraActionInfo_StringList.ProtoReflect.Descriptor instead.
+func (*ExtraActionInfo_StringList) Descriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescGZIP(), []int{2, 1}
+}
 
-func (m *PythonInfo) GetSourceFile() []string {
-	if m != nil {
-		return m.SourceFile
+func (x *ExtraActionInfo_StringList) GetValue() []string {
+	if x != nil {
+		return x.Value
 	}
 	return nil
 }
 
-func (m *PythonInfo) GetDepFile() []string {
-	if m != nil {
-		return m.DepFile
+type ExtraActionInfo_AspectDescriptor struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	AspectName       *string                                                 `protobuf:"bytes,1,opt,name=aspect_name,json=aspectName" json:"aspect_name,omitempty"`
+	AspectParameters map[string]*ExtraActionInfo_AspectDescriptor_StringList `protobuf:"bytes,2,rep,name=aspect_parameters,json=aspectParameters" json:"aspect_parameters,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
+}
+
+func (x *ExtraActionInfo_AspectDescriptor) Reset() {
+	*x = ExtraActionInfo_AspectDescriptor{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[11]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExtraActionInfo_AspectDescriptor) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExtraActionInfo_AspectDescriptor) ProtoMessage() {}
+
+func (x *ExtraActionInfo_AspectDescriptor) ProtoReflect() protoreflect.Message {
+	mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[11]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ExtraActionInfo_AspectDescriptor.ProtoReflect.Descriptor instead.
+func (*ExtraActionInfo_AspectDescriptor) Descriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescGZIP(), []int{2, 2}
+}
+
+func (x *ExtraActionInfo_AspectDescriptor) GetAspectName() string {
+	if x != nil && x.AspectName != nil {
+		return *x.AspectName
+	}
+	return ""
+}
+
+func (x *ExtraActionInfo_AspectDescriptor) GetAspectParameters() map[string]*ExtraActionInfo_AspectDescriptor_StringList {
+	if x != nil {
+		return x.AspectParameters
+	}
+	return nil
+}
+
+type ExtraActionInfo_AspectDescriptor_StringList struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Value []string `protobuf:"bytes,1,rep,name=value" json:"value,omitempty"`
+}
+
+func (x *ExtraActionInfo_AspectDescriptor_StringList) Reset() {
+	*x = ExtraActionInfo_AspectDescriptor_StringList{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[13]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExtraActionInfo_AspectDescriptor_StringList) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExtraActionInfo_AspectDescriptor_StringList) ProtoMessage() {}
+
+func (x *ExtraActionInfo_AspectDescriptor_StringList) ProtoReflect() protoreflect.Message {
+	mi := &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[13]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ExtraActionInfo_AspectDescriptor_StringList.ProtoReflect.Descriptor instead.
+func (*ExtraActionInfo_AspectDescriptor_StringList) Descriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescGZIP(), []int{2, 2, 1}
+}
+
+func (x *ExtraActionInfo_AspectDescriptor_StringList) GetValue() []string {
+	if x != nil {
+		return x.Value
 	}
 	return nil
 }
 
-var E_PythonInfo_PythonInfo = &proto.ExtensionDesc{
-	ExtendedType:  (*ExtraActionInfo)(nil),
-	ExtensionType: (*PythonInfo)(nil),
-	Field:         1005,
-	Name:          "blaze.PythonInfo.python_info",
-	Tag:           "bytes,1005,opt,name=python_info,json=pythonInfo",
-	Filename:      "third_party/bazel/src/main/protobuf/extra_actions_base.proto",
-}
-
-func init() {
-	proto.RegisterType((*ExtraActionSummary)(nil), "blaze.ExtraActionSummary")
-	proto.RegisterType((*DetailedExtraActionInfo)(nil), "blaze.DetailedExtraActionInfo")
-	proto.RegisterType((*ExtraActionInfo)(nil), "blaze.ExtraActionInfo")
-	proto.RegisterMapType((map[string]*ExtraActionInfo_StringList)(nil), "blaze.ExtraActionInfo.AspectParametersEntry")
-	proto.RegisterType((*ExtraActionInfo_StringList)(nil), "blaze.ExtraActionInfo.StringList")
-	proto.RegisterType((*ExtraActionInfo_AspectDescriptor)(nil), "blaze.ExtraActionInfo.AspectDescriptor")
-	proto.RegisterMapType((map[string]*ExtraActionInfo_AspectDescriptor_StringList)(nil), "blaze.ExtraActionInfo.AspectDescriptor.AspectParametersEntry")
-	proto.RegisterType((*ExtraActionInfo_AspectDescriptor_StringList)(nil), "blaze.ExtraActionInfo.AspectDescriptor.StringList")
-	proto.RegisterType((*EnvironmentVariable)(nil), "blaze.EnvironmentVariable")
-	proto.RegisterType((*SpawnInfo)(nil), "blaze.SpawnInfo")
-	proto.RegisterType((*CppCompileInfo)(nil), "blaze.CppCompileInfo")
-	proto.RegisterType((*CppLinkInfo)(nil), "blaze.CppLinkInfo")
-	proto.RegisterType((*JavaCompileInfo)(nil), "blaze.JavaCompileInfo")
-	proto.RegisterType((*PythonInfo)(nil), "blaze.PythonInfo")
-	proto.RegisterExtension(E_SpawnInfo_SpawnInfo)
-	proto.RegisterExtension(E_CppCompileInfo_CppCompileInfo)
-	proto.RegisterExtension(E_CppLinkInfo_CppLinkInfo)
-	proto.RegisterExtension(E_JavaCompileInfo_JavaCompileInfo)
-	proto.RegisterExtension(E_PythonInfo_PythonInfo)
-}
-
-func init() {
-	proto.RegisterFile("third_party/bazel/src/main/protobuf/extra_actions_base.proto", fileDescriptor_extra_actions_base_cd5af7b6b798b473)
-}
-
-var fileDescriptor_extra_actions_base_cd5af7b6b798b473 = []byte{
-	// 1067 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0xdd, 0x6e, 0xe3, 0x44,
-	0x14, 0x56, 0x9c, 0xa6, 0x8d, 0x4f, 0xb4, 0x69, 0x3a, 0xa5, 0x6c, 0x36, 0xc0, 0x6e, 0x09, 0x88,
-	0xad, 0x00, 0x39, 0x52, 0x2e, 0x16, 0xc4, 0x8f, 0x50, 0xb7, 0x5b, 0x54, 0xa0, 0xa2, 0x95, 0xbb,
-	0x42, 0x48, 0x08, 0x59, 0x13, 0x7b, 0x92, 0x4e, 0x6b, 0x7b, 0x46, 0xe3, 0x49, 0x4a, 0xf6, 0xaa,
-	0x4f, 0xc0, 0x1d, 0x77, 0x3c, 0x0a, 0x2f, 0xc1, 0x5b, 0xec, 0x82, 0xb8, 0xe3, 0x01, 0x56, 0xf3,
-	0x63, 0xbb, 0x4e, 0xd3, 0x6e, 0xef, 0x66, 0xbe, 0xf3, 0xf9, 0xcc, 0x39, 0xdf, 0x37, 0x73, 0x12,
-	0xf8, 0x4a, 0x9e, 0x52, 0x11, 0x05, 0x1c, 0x0b, 0x39, 0x1f, 0x8c, 0xf0, 0x0b, 0x12, 0x0f, 0x32,
-	0x11, 0x0e, 0x12, 0x4c, 0xd3, 0x01, 0x17, 0x4c, 0xb2, 0xd1, 0x74, 0x3c, 0x20, 0xbf, 0x49, 0x81,
-	0x03, 0x1c, 0x4a, 0xca, 0xd2, 0x2c, 0x18, 0xe1, 0x8c, 0x78, 0x3a, 0x86, 0x1a, 0xa3, 0x18, 0xbf,
-	0x20, 0xfd, 0x43, 0x40, 0xfb, 0x8a, 0xb2, 0xab, 0x19, 0x27, 0xd3, 0x24, 0xc1, 0x62, 0x8e, 0x9e,
-	0xc0, 0xaa, 0xf9, 0xa4, 0x5b, 0xdb, 0xae, 0xef, 0xb4, 0x86, 0x0f, 0x3d, 0xcd, 0xf6, 0x9e, 0x11,
-	0x89, 0x69, 0x4c, 0xa2, 0x2b, 0x9f, 0x7c, 0x97, 0x8e, 0x99, 0x6f, 0xd9, 0x7d, 0x01, 0xf7, 0x6f,
-	0xa0, 0xa0, 0xc7, 0xb0, 0x2e, 0x05, 0x9d, 0x4c, 0x88, 0xa0, 0xe9, 0x24, 0x18, 0xd3, 0x98, 0x74,
-	0x6b, 0xdb, 0xb5, 0x1d, 0xd7, 0x6f, 0x97, 0xf0, 0xb7, 0x34, 0x26, 0xc8, 0x2b, 0xce, 0x76, 0xb6,
-	0x9d, 0x9d, 0xd6, 0xf0, 0x6d, 0x7b, 0xf6, 0x4d, 0x67, 0xfe, 0xdf, 0x80, 0xf5, 0xc5, 0xc3, 0xde,
-	0x82, 0x06, 0xbb, 0x48, 0x89, 0xb0, 0x47, 0x98, 0x0d, 0xfa, 0x00, 0x5a, 0x38, 0xe3, 0x24, 0x94,
-	0x41, 0x8a, 0x13, 0xd2, 0x5d, 0x55, 0xb1, 0xa7, 0x4e, 0xb7, 0xe6, 0x83, 0x81, 0x7f, 0xc4, 0x09,
-	0x41, 0xbf, 0xc2, 0x86, 0x25, 0x71, 0x2c, 0x70, 0x42, 0x24, 0x11, 0x59, 0x77, 0x4d, 0xab, 0xf0,
-	0xe9, 0xf2, 0x4a, 0xbc, 0x5d, 0xcd, 0x3f, 0x2e, 0xe8, 0xfb, 0xa9, 0x14, 0x73, 0x9d, 0xb8, 0x83,
-	0x17, 0x42, 0x68, 0x17, 0xd6, 0x0c, 0x96, 0x75, 0x9b, 0x3a, 0xe9, 0xe3, 0x5b, 0x93, 0x3e, 0x23,
-	0x59, 0x28, 0x28, 0x97, 0x4c, 0xf8, 0xf9, 0x77, 0xa8, 0x0d, 0x0e, 0x8d, 0xba, 0x8e, 0xee, 0xcc,
-	0xa1, 0x11, 0xea, 0x41, 0x33, 0x49, 0x49, 0xc2, 0x52, 0x1a, 0x76, 0x1b, 0x1a, 0x2d, 0xf6, 0xbd,
-	0x31, 0x6c, 0x2d, 0xad, 0x0e, 0x75, 0xa0, 0x7e, 0x4e, 0xe6, 0x56, 0x1f, 0xb5, 0x44, 0x9f, 0x41,
-	0x63, 0x86, 0xe3, 0x29, 0xd1, 0x99, 0x5b, 0xc3, 0xf7, 0x6f, 0xa8, 0xeb, 0x44, 0x2a, 0xa7, 0x0e,
-	0x69, 0x26, 0x7d, 0xc3, 0xff, 0xc2, 0xf9, 0xbc, 0xd6, 0xfb, 0x08, 0xa0, 0x0c, 0x28, 0xf9, 0x4d,
-	0x2a, 0x75, 0x7b, 0xdc, 0x82, 0xd7, 0xad, 0xf5, 0xfe, 0x72, 0xa0, 0xb3, 0xd8, 0x19, 0x7a, 0x54,
-	0xf5, 0xc5, 0xd4, 0x74, 0xd5, 0x93, 0xb3, 0x65, 0x9e, 0x38, 0x5a, 0xbe, 0xaf, 0xef, 0x28, 0xdf,
-	0x72, 0x93, 0xae, 0x1b, 0xd4, 0xbb, 0xb8, 0xbb, 0x62, 0x07, 0x55, 0xc5, 0x86, 0x77, 0x2d, 0x65,
-	0xb9, 0x84, 0xfd, 0x37, 0x4b, 0xf8, 0xb1, 0xdb, 0x7c, 0xb9, 0xd6, 0xb9, 0xbc, 0xbc, 0xbc, 0x74,
-	0xfa, 0xdf, 0xc0, 0xe6, 0x7e, 0x3a, 0xa3, 0x82, 0xa5, 0x09, 0x49, 0xe5, 0x4f, 0x58, 0x50, 0x3c,
-	0x8a, 0x09, 0x42, 0xb0, 0x62, 0x45, 0x74, 0x76, 0x5c, 0x5f, 0xaf, 0xcb, 0x5c, 0x8e, 0x06, 0xcd,
-	0xa6, 0xff, 0xaa, 0x06, 0xee, 0x09, 0xc7, 0x17, 0xe6, 0xc5, 0xf4, 0xa0, 0x89, 0xc5, 0x64, 0xaa,
-	0x72, 0xd9, 0x23, 0x8b, 0x3d, 0x7a, 0x02, 0xcd, 0x99, 0xcd, 0x6f, 0x55, 0xef, 0xe5, 0xad, 0x5e,
-	0xaf, 0xc0, 0x2f, 0xb8, 0xe8, 0x3d, 0x00, 0x9a, 0xf2, 0xa9, 0x34, 0xaf, 0x7d, 0x45, 0x67, 0x75,
-	0x35, 0xa2, 0x1f, 0xfa, 0x23, 0x68, 0xb1, 0xa9, 0x2c, 0xe2, 0x0d, 0x1d, 0x07, 0x03, 0x29, 0xc2,
-	0xf0, 0x00, 0x20, 0x53, 0x05, 0x06, 0x54, 0x55, 0x78, 0xc3, 0x1c, 0xe8, 0xfe, 0xbb, 0xa6, 0xd5,
-	0xef, 0xd8, 0x70, 0xd1, 0x92, 0xef, 0x66, 0xf9, 0xb2, 0xff, 0xb7, 0x03, 0xed, 0x3d, 0xce, 0xf7,
-	0x58, 0xc2, 0x69, 0x4c, 0x74, 0xc3, 0x08, 0x56, 0x24, 0x63, 0xb1, 0xf5, 0x53, 0xaf, 0xd5, 0x8c,
-	0x0a, 0x0d, 0x45, 0x04, 0x8c, 0xdb, 0x19, 0xa4, 0xaa, 0x6a, 0xe7, 0xf0, 0x91, 0x46, 0x55, 0xe9,
-	0x19, 0x9b, 0x8a, 0x90, 0x98, 0xd2, 0xeb, 0xe6, 0xc6, 0x1a, 0x68, 0x59, 0x6f, 0x2b, 0x86, 0x50,
-	0xf6, 0x86, 0x3c, 0xd8, 0x34, 0xf4, 0x2c, 0xc0, 0x69, 0x14, 0x9c, 0x12, 0x1c, 0xa9, 0x4b, 0x6d,
-	0x44, 0xd8, 0xb0, 0xa1, 0xdd, 0x34, 0x3a, 0x30, 0x81, 0x8a, 0x07, 0xab, 0x77, 0xf7, 0x60, 0xf8,
-	0x33, 0x74, 0x42, 0xce, 0x03, 0x5b, 0xff, 0xed, 0x4a, 0xbe, 0x32, 0x4a, 0x6e, 0xd9, 0x70, 0x55,
-	0x30, 0xbf, 0x1d, 0x56, 0xf6, 0xfd, 0x3f, 0xeb, 0xd0, 0xda, 0xe3, 0xfc, 0x90, 0xa6, 0xe7, 0x5a,
-	0xd0, 0xaa, 0xdb, 0xb5, 0x37, 0xb8, 0xed, 0x5c, 0x53, 0x64, 0x08, 0x5b, 0x34, 0x95, 0x44, 0x8c,
-	0x71, 0x48, 0x82, 0xab, 0x54, 0xa3, 0xee, 0x66, 0x11, 0x3c, 0x2a, 0xbf, 0xd9, 0x81, 0x4e, 0x4c,
-	0xd3, 0xf3, 0x40, 0x62, 0x31, 0x21, 0x32, 0x90, 0x73, 0x9e, 0x6b, 0xdd, 0x56, 0xf8, 0x73, 0x0d,
-	0x3f, 0x9f, 0x73, 0xa2, 0xac, 0xd5, 0xcc, 0x4c, 0x62, 0x49, 0xc3, 0x94, 0x64, 0x99, 0x9d, 0x95,
-	0x9a, 0x78, 0x52, 0xa0, 0xaa, 0x8d, 0x9c, 0x98, 0x70, 0x2d, 0xb5, 0xeb, 0xbb, 0x96, 0x93, 0x70,
-	0xf4, 0x25, 0xf4, 0x46, 0x53, 0x1a, 0x47, 0x5a, 0x49, 0x6b, 0x5b, 0x80, 0x85, 0xa4, 0x63, 0x1c,
-	0x4a, 0xfd, 0x3b, 0xe1, 0xfa, 0xf7, 0x35, 0x43, 0x89, 0x62, 0xdc, 0xdb, 0xb5, 0x61, 0xf4, 0x00,
-	0x9a, 0x3a, 0x37, 0xe3, 0x52, 0x4f, 0x7f, 0xd7, 0x5f, 0x53, 0xfb, 0x23, 0x2e, 0x87, 0x47, 0x70,
-	0x4f, 0xf9, 0xa4, 0xc3, 0xb7, 0x9a, 0xf4, 0x8f, 0x31, 0x09, 0x95, 0x26, 0xe5, 0x0e, 0xf8, 0xad,
-	0xb0, 0xdc, 0xf4, 0x7f, 0xaf, 0xc3, 0xfa, 0xf7, 0x78, 0x86, 0xaf, 0xde, 0xf9, 0x77, 0xc1, 0x35,
-	0xc2, 0x9e, 0xe1, 0xfc, 0xa7, 0xb1, 0x04, 0x54, 0x34, 0x8c, 0x71, 0x96, 0x71, 0x2c, 0x4f, 0xed,
-	0xbd, 0x2f, 0x01, 0xf4, 0x10, 0xec, 0xfd, 0xd6, 0xe1, 0xba, 0x79, 0xac, 0x25, 0xb2, 0xf8, 0x24,
-	0x56, 0xae, 0x12, 0xb4, 0x57, 0xef, 0x80, 0x7b, 0x86, 0x67, 0x38, 0xd4, 0xdd, 0x9b, 0x7b, 0xde,
-	0xd4, 0xc0, 0x11, 0x97, 0xea, 0x6c, 0x2e, 0x58, 0x48, 0xb2, 0x8c, 0x89, 0x5c, 0xf4, 0x02, 0x40,
-	0x1f, 0xc2, 0xbd, 0x62, 0xa3, 0x8f, 0x37, 0x3a, 0x57, 0x41, 0xc5, 0x1a, 0x31, 0x26, 0xcb, 0x1e,
-	0x8c, 0xc4, 0x55, 0xb0, 0x32, 0xe8, 0xdc, 0xea, 0xa0, 0x1b, 0xfe, 0x02, 0x1b, 0xaa, 0xa2, 0xbb,
-	0xbd, 0x96, 0x97, 0xc6, 0x88, 0x3c, 0xbc, 0xa0, 0xb5, 0xbf, 0x7e, 0x56, 0x05, 0xfa, 0x7f, 0xd4,
-	0x00, 0x8e, 0xe7, 0xf2, 0xd4, 0xfe, 0x45, 0x59, 0xd0, 0xab, 0x76, 0x4d, 0xaf, 0x07, 0xd0, 0x8c,
-	0x08, 0xcf, 0x5f, 0x8b, 0xbe, 0x2c, 0x11, 0xe1, 0x7a, 0x30, 0xfe, 0x00, 0x2d, 0xae, 0x33, 0xdd,
-	0x5e, 0xe1, 0x7f, 0xa6, 0xc2, 0x0d, 0x1b, 0x2e, 0x0f, 0xf7, 0x81, 0x17, 0xeb, 0xa7, 0x03, 0xf8,
-	0x24, 0x64, 0x89, 0x37, 0x61, 0x6c, 0x12, 0x13, 0x2f, 0x22, 0x33, 0x35, 0x0a, 0x33, 0x4f, 0xdf,
-	0x61, 0x2f, 0xa6, 0x23, 0xcf, 0xfe, 0x79, 0xf4, 0xf4, 0x5f, 0xc9, 0xe3, 0xda, 0xeb, 0x00, 0x00,
-	0x00, 0xff, 0xff, 0xdb, 0x0d, 0x53, 0x93, 0x78, 0x0a, 0x00, 0x00,
+var file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_extTypes = []protoimpl.ExtensionInfo{
+	{
+		ExtendedType:  (*ExtraActionInfo)(nil),
+		ExtensionType: (*SpawnInfo)(nil),
+		Field:         1003,
+		Name:          "blaze.SpawnInfo.spawn_info",
+		Tag:           "bytes,1003,opt,name=spawn_info",
+		Filename:      "third_party/bazel/src/main/protobuf/extra_actions_base.proto",
+	},
+	{
+		ExtendedType:  (*ExtraActionInfo)(nil),
+		ExtensionType: (*CppCompileInfo)(nil),
+		Field:         1001,
+		Name:          "blaze.CppCompileInfo.cpp_compile_info",
+		Tag:           "bytes,1001,opt,name=cpp_compile_info",
+		Filename:      "third_party/bazel/src/main/protobuf/extra_actions_base.proto",
+	},
+	{
+		ExtendedType:  (*ExtraActionInfo)(nil),
+		ExtensionType: (*CppLinkInfo)(nil),
+		Field:         1002,
+		Name:          "blaze.CppLinkInfo.cpp_link_info",
+		Tag:           "bytes,1002,opt,name=cpp_link_info",
+		Filename:      "third_party/bazel/src/main/protobuf/extra_actions_base.proto",
+	},
+	{
+		ExtendedType:  (*ExtraActionInfo)(nil),
+		ExtensionType: (*JavaCompileInfo)(nil),
+		Field:         1000,
+		Name:          "blaze.JavaCompileInfo.java_compile_info",
+		Tag:           "bytes,1000,opt,name=java_compile_info",
+		Filename:      "third_party/bazel/src/main/protobuf/extra_actions_base.proto",
+	},
+	{
+		ExtendedType:  (*ExtraActionInfo)(nil),
+		ExtensionType: (*PythonInfo)(nil),
+		Field:         1005,
+		Name:          "blaze.PythonInfo.python_info",
+		Tag:           "bytes,1005,opt,name=python_info",
+		Filename:      "third_party/bazel/src/main/protobuf/extra_actions_base.proto",
+	},
+}
+
+// Extension fields to ExtraActionInfo.
+var (
+	// optional blaze.SpawnInfo spawn_info = 1003;
+	E_SpawnInfo_SpawnInfo = &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_extTypes[0]
+	// optional blaze.CppCompileInfo cpp_compile_info = 1001;
+	E_CppCompileInfo_CppCompileInfo = &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_extTypes[1]
+	// optional blaze.CppLinkInfo cpp_link_info = 1002;
+	E_CppLinkInfo_CppLinkInfo = &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_extTypes[2]
+	// optional blaze.JavaCompileInfo java_compile_info = 1000;
+	E_JavaCompileInfo_JavaCompileInfo = &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_extTypes[3]
+	// optional blaze.PythonInfo python_info = 1005;
+	E_PythonInfo_PythonInfo = &file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_extTypes[4]
+)
+
+var File_third_party_bazel_src_main_protobuf_extra_actions_base_proto protoreflect.FileDescriptor
+
+var file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDesc = []byte{
+	0x0a, 0x3c, 0x74, 0x68, 0x69, 0x72, 0x64, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x79, 0x2f, 0x62, 0x61,
+	0x7a, 0x65, 0x6c, 0x2f, 0x73, 0x72, 0x63, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x2f, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x78, 0x74, 0x72, 0x61, 0x5f, 0x61, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x5f, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05,
+	0x62, 0x6c, 0x61, 0x7a, 0x65, 0x22, 0x4c, 0x0a, 0x12, 0x45, 0x78, 0x74, 0x72, 0x61, 0x41, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x53, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x12, 0x36, 0x0a, 0x06, 0x61,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x62, 0x6c,
+	0x61, 0x7a, 0x65, 0x2e, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x45, 0x78, 0x74, 0x72,
+	0x61, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x61, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x22, 0x72, 0x0a, 0x17, 0x44, 0x65, 0x74, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x45,
+	0x78, 0x74, 0x72, 0x61, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x27,
+	0x0a, 0x0f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x66, 0x69, 0x6c,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
+	0x69, 0x6e, 0x67, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x2e, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x02, 0x20, 0x02, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e,
+	0x45, 0x78, 0x74, 0x72, 0x61, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xf4, 0x05, 0x0a, 0x0f, 0x45, 0x78, 0x74, 0x72,
+	0x61, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x14, 0x0a, 0x05, 0x6f,
+	0x77, 0x6e, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6f, 0x77, 0x6e, 0x65,
+	0x72, 0x12, 0x23, 0x0a, 0x0b, 0x61, 0x73, 0x70, 0x65, 0x63, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0a, 0x61, 0x73, 0x70, 0x65,
+	0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x5d, 0x0a, 0x11, 0x61, 0x73, 0x70, 0x65, 0x63, 0x74,
+	0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x2c, 0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e, 0x45, 0x78, 0x74, 0x72, 0x61, 0x41,
+	0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x73, 0x70, 0x65, 0x63, 0x74,
+	0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x42,
+	0x02, 0x18, 0x01, 0x52, 0x10, 0x61, 0x73, 0x70, 0x65, 0x63, 0x74, 0x50, 0x61, 0x72, 0x61, 0x6d,
+	0x65, 0x74, 0x65, 0x72, 0x73, 0x12, 0x41, 0x0a, 0x07, 0x61, 0x73, 0x70, 0x65, 0x63, 0x74, 0x73,
+	0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e, 0x45,
+	0x78, 0x74, 0x72, 0x61, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x41,
+	0x73, 0x70, 0x65, 0x63, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52,
+	0x07, 0x61, 0x73, 0x70, 0x65, 0x63, 0x74, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x6e, 0x65, 0x6d,
+	0x6f, 0x6e, 0x69, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6d, 0x6e, 0x65, 0x6d,
+	0x6f, 0x6e, 0x69, 0x63, 0x1a, 0x66, 0x0a, 0x15, 0x41, 0x73, 0x70, 0x65, 0x63, 0x74, 0x50, 0x61,
+	0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x37, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21,
+	0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e, 0x45, 0x78, 0x74, 0x72, 0x61, 0x41, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x73,
+	0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x26, 0x0a, 0x0a,
+	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x18, 0x01, 0x1a, 0xbc, 0x02, 0x0a, 0x10, 0x41, 0x73, 0x70, 0x65, 0x63, 0x74, 0x44,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x61, 0x73, 0x70,
+	0x65, 0x63, 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x61, 0x73, 0x70, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x6a, 0x0a, 0x11, 0x61, 0x73,
+	0x70, 0x65, 0x63, 0x74, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x18,
+	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e, 0x45, 0x78,
+	0x74, 0x72, 0x61, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x73,
+	0x70, 0x65, 0x63, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x41,
+	0x73, 0x70, 0x65, 0x63, 0x74, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x52, 0x10, 0x61, 0x73, 0x70, 0x65, 0x63, 0x74, 0x50, 0x61, 0x72, 0x61,
+	0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x1a, 0x77, 0x0a, 0x15, 0x41, 0x73, 0x70, 0x65, 0x63, 0x74,
+	0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
+	0x79, 0x12, 0x48, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x32, 0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e, 0x45, 0x78, 0x74, 0x72, 0x61, 0x41, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x2e, 0x41, 0x73, 0x70, 0x65, 0x63, 0x74, 0x44,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
+	0x4c, 0x69, 0x73, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a,
+	0x22, 0x0a, 0x0a, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x14, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x2a, 0x09, 0x08, 0xe8, 0x07, 0x10, 0x80, 0x80, 0x80, 0x80, 0x02, 0x22, 0x3f,
+	0x0a, 0x13, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56, 0x61, 0x72,
+	0x69, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
+	0x02, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x02, 0x20, 0x02, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22,
+	0xe9, 0x01, 0x0a, 0x09, 0x53, 0x70, 0x61, 0x77, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a,
+	0x08, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x08, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x36, 0x0a, 0x08, 0x76, 0x61, 0x72,
+	0x69, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x62, 0x6c,
+	0x61, 0x7a, 0x65, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d, 0x65, 0x6e, 0x74, 0x56,
+	0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x08, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c,
+	0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18,
+	0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x69, 0x6c, 0x65,
+	0x12, 0x1f, 0x0a, 0x0b, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18,
+	0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x46, 0x69, 0x6c,
+	0x65, 0x32, 0x48, 0x0a, 0x0a, 0x73, 0x70, 0x61, 0x77, 0x6e, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12,
+	0x16, 0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e, 0x45, 0x78, 0x74, 0x72, 0x61, 0x41, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0xeb, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10,
+	0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e, 0x53, 0x70, 0x61, 0x77, 0x6e, 0x49, 0x6e, 0x66, 0x6f,
+	0x52, 0x09, 0x73, 0x70, 0x61, 0x77, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0xd1, 0x02, 0x0a, 0x0e,
+	0x43, 0x70, 0x70, 0x43, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12,
+	0x0a, 0x04, 0x74, 0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x6f,
+	0x6f, 0x6c, 0x12, 0x27, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x72, 0x5f, 0x6f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6d,
+	0x70, 0x69, 0x6c, 0x65, 0x72, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0a, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x1f, 0x0a, 0x0b,
+	0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0a, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x2e, 0x0a,
+	0x13, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x5f, 0x61, 0x6e, 0x64, 0x5f, 0x68, 0x65, 0x61,
+	0x64, 0x65, 0x72, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x73, 0x41, 0x6e, 0x64, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x73, 0x12, 0x36, 0x0a,
+	0x08, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x1a, 0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e, 0x45, 0x6e, 0x76, 0x69, 0x72, 0x6f, 0x6e, 0x6d,
+	0x65, 0x6e, 0x74, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x08, 0x76, 0x61, 0x72,
+	0x69, 0x61, 0x62, 0x6c, 0x65, 0x32, 0x58, 0x0a, 0x10, 0x63, 0x70, 0x70, 0x5f, 0x63, 0x6f, 0x6d,
+	0x70, 0x69, 0x6c, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x62, 0x6c, 0x61, 0x7a,
+	0x65, 0x2e, 0x45, 0x78, 0x74, 0x72, 0x61, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66,
+	0x6f, 0x18, 0xe9, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65,
+	0x2e, 0x43, 0x70, 0x70, 0x43, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x0e, 0x63, 0x70, 0x70, 0x43, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22,
+	0x9c, 0x03, 0x0a, 0x0b, 0x43, 0x70, 0x70, 0x4c, 0x69, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x12,
+	0x1d, 0x0a, 0x0a, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x09, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x1f,
+	0x0a, 0x0b, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0a, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x46, 0x69, 0x6c, 0x65, 0x12,
+	0x32, 0x0a, 0x15, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x5f, 0x6f, 0x75, 0x74,
+	0x70, 0x75, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13,
+	0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, 0x65, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x46,
+	0x69, 0x6c, 0x65, 0x12, 0x28, 0x0a, 0x10, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x74, 0x61, 0x72, 0x67,
+	0x65, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6c,
+	0x69, 0x6e, 0x6b, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x27, 0x0a,
+	0x0f, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x6e, 0x65, 0x73, 0x73,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6c, 0x69, 0x6e, 0x6b, 0x53, 0x74, 0x61, 0x74,
+	0x69, 0x63, 0x6e, 0x65, 0x73, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x73,
+	0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x69, 0x6e, 0x6b,
+	0x53, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x3b, 0x0a, 0x1a, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x5f, 0x69,
+	0x6e, 0x66, 0x6f, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x5f, 0x61, 0x72, 0x74, 0x69, 0x66,
+	0x61, 0x63, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x17, 0x62, 0x75, 0x69, 0x6c, 0x64,
+	0x49, 0x6e, 0x66, 0x6f, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x41, 0x72, 0x74, 0x69, 0x66, 0x61,
+	0x63, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x6f, 0x70, 0x74, 0x18, 0x08,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x6c, 0x69, 0x6e, 0x6b, 0x4f, 0x70, 0x74, 0x32, 0x4f, 0x0a,
+	0x0d, 0x63, 0x70, 0x70, 0x5f, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x16,
+	0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e, 0x45, 0x78, 0x74, 0x72, 0x61, 0x41, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0xea, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e,
+	0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e, 0x43, 0x70, 0x70, 0x4c, 0x69, 0x6e, 0x6b, 0x49, 0x6e, 0x66,
+	0x6f, 0x52, 0x0b, 0x63, 0x70, 0x70, 0x4c, 0x69, 0x6e, 0x6b, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x8e,
+	0x03, 0x0a, 0x0f, 0x4a, 0x61, 0x76, 0x61, 0x43, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x49, 0x6e,
+	0x66, 0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x6a, 0x61, 0x72, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x6a, 0x61, 0x72,
+	0x12, 0x1c, 0x0a, 0x09, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1e,
+	0x0a, 0x0a, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x0a, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1f,
+	0x0a, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x04, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12,
+	0x1b, 0x0a, 0x09, 0x6a, 0x61, 0x76, 0x61, 0x63, 0x5f, 0x6f, 0x70, 0x74, 0x18, 0x05, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x08, 0x6a, 0x61, 0x76, 0x61, 0x63, 0x4f, 0x70, 0x74, 0x12, 0x1c, 0x0a, 0x09,
+	0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52,
+	0x09, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x70, 0x72,
+	0x6f, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x70, 0x61, 0x74, 0x68, 0x18, 0x07, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x70, 0x61, 0x74, 0x68,
+	0x12, 0x24, 0x0a, 0x0d, 0x62, 0x6f, 0x6f, 0x74, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x70, 0x61, 0x74,
+	0x68, 0x18, 0x08, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x62, 0x6f, 0x6f, 0x74, 0x63, 0x6c, 0x61,
+	0x73, 0x73, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65,
+	0x6e, 0x74, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65,
+	0x6e, 0x74, 0x32, 0x5b, 0x0a, 0x11, 0x6a, 0x61, 0x76, 0x61, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x69,
+	0x6c, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e,
+	0x45, 0x78, 0x74, 0x72, 0x61, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x18,
+	0xe8, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e, 0x4a,
+	0x61, 0x76, 0x61, 0x43, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0f,
+	0x6a, 0x61, 0x76, 0x61, 0x43, 0x6f, 0x6d, 0x70, 0x69, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x22,
+	0x95, 0x01, 0x0a, 0x0a, 0x50, 0x79, 0x74, 0x68, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f,
+	0x0a, 0x0b, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12,
+	0x19, 0x0a, 0x08, 0x64, 0x65, 0x70, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x07, 0x64, 0x65, 0x70, 0x46, 0x69, 0x6c, 0x65, 0x32, 0x4b, 0x0a, 0x0b, 0x70, 0x79,
+	0x74, 0x68, 0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x2e, 0x62, 0x6c, 0x61, 0x7a,
+	0x65, 0x2e, 0x45, 0x78, 0x74, 0x72, 0x61, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66,
+	0x6f, 0x18, 0xed, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65,
+	0x2e, 0x50, 0x79, 0x74, 0x68, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0a, 0x70, 0x79, 0x74,
+	0x68, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x2f, 0x0a, 0x2b, 0x63, 0x6f, 0x6d, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x64, 0x65, 0x76, 0x74, 0x6f, 0x6f, 0x6c, 0x73, 0x2e, 0x62,
+	0x75, 0x69, 0x6c, 0x64, 0x2e, 0x6c, 0x69, 0x62, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x2e, 0x65, 0x78, 0x74, 0x72, 0x61, 0x50, 0x01,
+}
+
+var (
+	file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescOnce sync.Once
+	file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescData = file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDesc
+)
+
+func file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescGZIP() []byte {
+	file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescOnce.Do(func() {
+		file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescData = protoimpl.X.CompressGZIP(file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescData)
+	})
+	return file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDescData
+}
+
+var file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
+var file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_goTypes = []interface{}{
+	(*ExtraActionSummary)(nil),               // 0: blaze.ExtraActionSummary
+	(*DetailedExtraActionInfo)(nil),          // 1: blaze.DetailedExtraActionInfo
+	(*ExtraActionInfo)(nil),                  // 2: blaze.ExtraActionInfo
+	(*EnvironmentVariable)(nil),              // 3: blaze.EnvironmentVariable
+	(*SpawnInfo)(nil),                        // 4: blaze.SpawnInfo
+	(*CppCompileInfo)(nil),                   // 5: blaze.CppCompileInfo
+	(*CppLinkInfo)(nil),                      // 6: blaze.CppLinkInfo
+	(*JavaCompileInfo)(nil),                  // 7: blaze.JavaCompileInfo
+	(*PythonInfo)(nil),                       // 8: blaze.PythonInfo
+	nil,                                      // 9: blaze.ExtraActionInfo.AspectParametersEntry
+	(*ExtraActionInfo_StringList)(nil),       // 10: blaze.ExtraActionInfo.StringList
+	(*ExtraActionInfo_AspectDescriptor)(nil), // 11: blaze.ExtraActionInfo.AspectDescriptor
+	nil,                                      // 12: blaze.ExtraActionInfo.AspectDescriptor.AspectParametersEntry
+	(*ExtraActionInfo_AspectDescriptor_StringList)(nil), // 13: blaze.ExtraActionInfo.AspectDescriptor.StringList
+}
+var file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_depIdxs = []int32{
+	1,  // 0: blaze.ExtraActionSummary.action:type_name -> blaze.DetailedExtraActionInfo
+	2,  // 1: blaze.DetailedExtraActionInfo.action:type_name -> blaze.ExtraActionInfo
+	9,  // 2: blaze.ExtraActionInfo.aspect_parameters:type_name -> blaze.ExtraActionInfo.AspectParametersEntry
+	11, // 3: blaze.ExtraActionInfo.aspects:type_name -> blaze.ExtraActionInfo.AspectDescriptor
+	3,  // 4: blaze.SpawnInfo.variable:type_name -> blaze.EnvironmentVariable
+	3,  // 5: blaze.CppCompileInfo.variable:type_name -> blaze.EnvironmentVariable
+	10, // 6: blaze.ExtraActionInfo.AspectParametersEntry.value:type_name -> blaze.ExtraActionInfo.StringList
+	12, // 7: blaze.ExtraActionInfo.AspectDescriptor.aspect_parameters:type_name -> blaze.ExtraActionInfo.AspectDescriptor.AspectParametersEntry
+	13, // 8: blaze.ExtraActionInfo.AspectDescriptor.AspectParametersEntry.value:type_name -> blaze.ExtraActionInfo.AspectDescriptor.StringList
+	2,  // 9: blaze.SpawnInfo.spawn_info:extendee -> blaze.ExtraActionInfo
+	2,  // 10: blaze.CppCompileInfo.cpp_compile_info:extendee -> blaze.ExtraActionInfo
+	2,  // 11: blaze.CppLinkInfo.cpp_link_info:extendee -> blaze.ExtraActionInfo
+	2,  // 12: blaze.JavaCompileInfo.java_compile_info:extendee -> blaze.ExtraActionInfo
+	2,  // 13: blaze.PythonInfo.python_info:extendee -> blaze.ExtraActionInfo
+	4,  // 14: blaze.SpawnInfo.spawn_info:type_name -> blaze.SpawnInfo
+	5,  // 15: blaze.CppCompileInfo.cpp_compile_info:type_name -> blaze.CppCompileInfo
+	6,  // 16: blaze.CppLinkInfo.cpp_link_info:type_name -> blaze.CppLinkInfo
+	7,  // 17: blaze.JavaCompileInfo.java_compile_info:type_name -> blaze.JavaCompileInfo
+	8,  // 18: blaze.PythonInfo.python_info:type_name -> blaze.PythonInfo
+	19, // [19:19] is the sub-list for method output_type
+	19, // [19:19] is the sub-list for method input_type
+	14, // [14:19] is the sub-list for extension type_name
+	9,  // [9:14] is the sub-list for extension extendee
+	0,  // [0:9] is the sub-list for field type_name
+}
+
+func init() { file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_init() }
+func file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_init() {
+	if File_third_party_bazel_src_main_protobuf_extra_actions_base_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExtraActionSummary); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*DetailedExtraActionInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExtraActionInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			case 3:
+				return &v.extensionFields
+			default:
+				return nil
+			}
+		}
+		file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EnvironmentVariable); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SpawnInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CppCompileInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CppLinkInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*JavaCompileInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*PythonInfo); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExtraActionInfo_StringList); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExtraActionInfo_AspectDescriptor); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExtraActionInfo_AspectDescriptor_StringList); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   14,
+			NumExtensions: 5,
+			NumServices:   0,
+		},
+		GoTypes:           file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_goTypes,
+		DependencyIndexes: file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_depIdxs,
+		MessageInfos:      file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_msgTypes,
+		ExtensionInfos:    file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_extTypes,
+	}.Build()
+	File_third_party_bazel_src_main_protobuf_extra_actions_base_proto = out.File
+	file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_rawDesc = nil
+	file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_goTypes = nil
+	file_third_party_bazel_src_main_protobuf_extra_actions_base_proto_depIdxs = nil
 }


Test patch:
diff --git a/kythe/go/extractors/govname/govname_test.go b/kythe/go/extractors/govname/govname_test.go
index 67ee25e45..d3480e9e1 100644
--- a/kythe/go/extractors/govname/govname_test.go
+++ b/kythe/go/extractors/govname/govname_test.go
@@ -24,8 +24,8 @@ import (
 	"kythe.io/kythe/go/util/kytheuri"
 	"kythe.io/kythe/go/util/vnameutil"
 
-	"github.com/golang/protobuf/proto"
 	"golang.org/x/tools/go/vcs"
+	"google.golang.org/protobuf/proto"
 
 	spb "kythe.io/kythe/proto/storage_go_proto"
 )
diff --git a/kythe/go/platform/kcd/testutil/BUILD b/kythe/go/platform/kcd/testutil/BUILD
index ae8a853a7..1e258b610 100644
--- a/kythe/go/platform/kcd/testutil/BUILD
+++ b/kythe/go/platform/kcd/testutil/BUILD
@@ -10,6 +10,6 @@ go_library(
         "//kythe/go/platform/kcd/kythe",
         "//kythe/proto:analysis_go_proto",
         "//kythe/proto:storage_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/platform/kcd/testutil/testutil.go b/kythe/go/platform/kcd/testutil/testutil.go
index 1c0b27ea4..7f9894cbe 100644
--- a/kythe/go/platform/kcd/testutil/testutil.go
+++ b/kythe/go/platform/kcd/testutil/testutil.go
@@ -30,7 +30,7 @@ import (
 	"kythe.io/kythe/go/platform/kcd"
 	"kythe.io/kythe/go/platform/kcd/kythe"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	apb "kythe.io/kythe/proto/analysis_go_proto"
 	spb "kythe.io/kythe/proto/storage_go_proto"
diff --git a/kythe/go/services/graphstore/proxy/proxy_test.go b/kythe/go/services/graphstore/proxy/proxy_test.go
index 6ec0fa440..3b92fa73f 100644
--- a/kythe/go/services/graphstore/proxy/proxy_test.go
+++ b/kythe/go/services/graphstore/proxy/proxy_test.go
@@ -25,7 +25,7 @@ import (
 
 	"kythe.io/kythe/go/services/graphstore"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	spb "kythe.io/kythe/proto/storage_go_proto"
 )
diff --git a/kythe/go/serving/explore/explore_test.go b/kythe/go/serving/explore/explore_test.go
index 943238e32..58518c54e 100644
--- a/kythe/go/serving/explore/explore_test.go
+++ b/kythe/go/serving/explore/explore_test.go
@@ -25,7 +25,7 @@ import (
 	"kythe.io/kythe/go/test/testutil"
 
 	"bitbucket.org/creachadair/stringset"
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	epb "kythe.io/kythe/proto/explore_go_proto"
 	srvpb "kythe.io/kythe/proto/serving_go_proto"
diff --git a/kythe/go/serving/graph/graph_test.go b/kythe/go/serving/graph/graph_test.go
index 2ee1842ba..9949d390e 100644
--- a/kythe/go/serving/graph/graph_test.go
+++ b/kythe/go/serving/graph/graph_test.go
@@ -25,10 +25,10 @@ import (
 	"kythe.io/kythe/go/util/kytheuri"
 
 	"bitbucket.org/creachadair/stringset"
-	"github.com/golang/protobuf/proto"
 	"golang.org/x/text/encoding"
 	"golang.org/x/text/encoding/unicode"
 	"golang.org/x/text/transform"
+	"google.golang.org/protobuf/proto"
 
 	cpb "kythe.io/kythe/proto/common_go_proto"
 	gpb "kythe.io/kythe/proto/graph_go_proto"
diff --git a/kythe/go/serving/identifiers/identifiers_test.go b/kythe/go/serving/identifiers/identifiers_test.go
index 7032a5770..7ee8d9f04 100644
--- a/kythe/go/serving/identifiers/identifiers_test.go
+++ b/kythe/go/serving/identifiers/identifiers_test.go
@@ -20,7 +20,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	"kythe.io/kythe/go/storage/table"
 	"kythe.io/kythe/go/test/testutil"
diff --git a/kythe/go/serving/pipeline/beam_integration_test.go b/kythe/go/serving/pipeline/beam_integration_test.go
index eee214199..0f7702310 100644
--- a/kythe/go/serving/pipeline/beam_integration_test.go
+++ b/kythe/go/serving/pipeline/beam_integration_test.go
@@ -34,7 +34,7 @@ import (
 
 	"github.com/apache/beam/sdks/go/pkg/beam"
 	"github.com/apache/beam/sdks/go/pkg/beam/testing/ptest"
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	cpb "kythe.io/kythe/proto/common_go_proto"
 	gpb "kythe.io/kythe/proto/graph_go_proto"
diff --git a/kythe/go/serving/pipeline/beam_test.go b/kythe/go/serving/pipeline/beam_test.go
index 54ab0773a..de03e36b9 100644
--- a/kythe/go/serving/pipeline/beam_test.go
+++ b/kythe/go/serving/pipeline/beam_test.go
@@ -25,7 +25,7 @@ import (
 	"github.com/apache/beam/sdks/go/pkg/beam/testing/passert"
 	"github.com/apache/beam/sdks/go/pkg/beam/testing/ptest"
 	"github.com/apache/beam/sdks/go/pkg/beam/x/debug"
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	cpb "kythe.io/kythe/proto/common_go_proto"
 	ppb "kythe.io/kythe/proto/pipeline_go_proto"
diff --git a/kythe/go/serving/pipeline/beamtest/BUILD b/kythe/go/serving/pipeline/beamtest/BUILD
index 8627d7ec8..8882928d2 100644
--- a/kythe/go/serving/pipeline/beamtest/BUILD
+++ b/kythe/go/serving/pipeline/beamtest/BUILD
@@ -9,6 +9,6 @@ go_library(
         "@com_github_apache_beam//sdks/go/pkg/beam:go_default_library",
         "@com_github_apache_beam//sdks/go/pkg/beam/core/runtime:go_default_library",
         "@com_github_apache_beam//sdks/go/pkg/beam/core/util/reflectx:go_default_library",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/serving/pipeline/beamtest/beamtest.go b/kythe/go/serving/pipeline/beamtest/beamtest.go
index 1b063d7a4..717a7868b 100644
--- a/kythe/go/serving/pipeline/beamtest/beamtest.go
+++ b/kythe/go/serving/pipeline/beamtest/beamtest.go
@@ -25,7 +25,7 @@ import (
 	"github.com/apache/beam/sdks/go/pkg/beam"
 	"github.com/apache/beam/sdks/go/pkg/beam/core/runtime"
 	"github.com/apache/beam/sdks/go/pkg/beam/core/util/reflectx"
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 )
 
 // CheckRegistrations returns an error if p uses any non-registered types.
diff --git a/kythe/go/serving/xrefs/assemble/assemble_test.go b/kythe/go/serving/xrefs/assemble/assemble_test.go
index 620484770..537340a66 100644
--- a/kythe/go/serving/xrefs/assemble/assemble_test.go
+++ b/kythe/go/serving/xrefs/assemble/assemble_test.go
@@ -22,7 +22,7 @@ import (
 
 	"kythe.io/kythe/go/test/testutil"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	ipb "kythe.io/kythe/proto/internal_go_proto"
 	srvpb "kythe.io/kythe/proto/serving_go_proto"
diff --git a/kythe/go/serving/xrefs/xrefs_test.go b/kythe/go/serving/xrefs/xrefs_test.go
index 2fa041360..e4a02f177 100644
--- a/kythe/go/serving/xrefs/xrefs_test.go
+++ b/kythe/go/serving/xrefs/xrefs_test.go
@@ -29,10 +29,10 @@ import (
 	"kythe.io/kythe/go/util/kytheuri"
 	"kythe.io/kythe/go/util/span"
 
-	"github.com/golang/protobuf/proto"
 	"golang.org/x/text/encoding"
 	"golang.org/x/text/encoding/unicode"
 	"golang.org/x/text/transform"
+	"google.golang.org/protobuf/proto"
 
 	cpb "kythe.io/kythe/proto/common_go_proto"
 	srvpb "kythe.io/kythe/proto/serving_go_proto"
diff --git a/kythe/go/storage/keyvalue/keyvalue_test.go b/kythe/go/storage/keyvalue/keyvalue_test.go
index 8bcc480ab..01bd47595 100644
--- a/kythe/go/storage/keyvalue/keyvalue_test.go
+++ b/kythe/go/storage/keyvalue/keyvalue_test.go
@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	spb "kythe.io/kythe/proto/storage_go_proto"
 )
diff --git a/kythe/go/test/services/xrefs/BUILD b/kythe/go/test/services/xrefs/BUILD
index 14c88525d..d3d15a3d3 100644
--- a/kythe/go/test/services/xrefs/BUILD
+++ b/kythe/go/test/services/xrefs/BUILD
@@ -14,6 +14,6 @@ go_library(
         "//kythe/proto:common_go_proto",
         "//kythe/proto:storage_go_proto",
         "//kythe/proto:xref_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/test/services/xrefs/xrefs.go b/kythe/go/test/services/xrefs/xrefs.go
index ff6bf3b7d..8a1e3251b 100644
--- a/kythe/go/test/services/xrefs/xrefs.go
+++ b/kythe/go/test/services/xrefs/xrefs.go
@@ -38,7 +38,7 @@ import (
 	"kythe.io/kythe/go/util/schema/facts"
 	"kythe.io/kythe/go/util/schema/nodes"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	cpb "kythe.io/kythe/proto/common_go_proto"
 	spb "kythe.io/kythe/proto/storage_go_proto"
diff --git a/kythe/go/test/testutil/BUILD b/kythe/go/test/testutil/BUILD
index d79cc72e3..be24eabd0 100644
--- a/kythe/go/test/testutil/BUILD
+++ b/kythe/go/test/testutil/BUILD
@@ -6,7 +6,7 @@ go_library(
     name = "testutil",
     srcs = ["testutil.go"],
     deps = [
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
         "@com_github_google_go_cmp//cmp:go_default_library",
         "@io_k8s_sigs_yaml//:go_default_library",
     ],
diff --git a/kythe/go/test/testutil/testutil.go b/kythe/go/test/testutil/testutil.go
index 7f0d5ff42..888e69698 100644
--- a/kythe/go/test/testutil/testutil.go
+++ b/kythe/go/test/testutil/testutil.go
@@ -29,8 +29,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/google/go-cmp/cmp"
+	"google.golang.org/protobuf/proto"
 	"sigs.k8s.io/yaml"
 )
 
diff --git a/kythe/go/util/kytheuri/uri_test.go b/kythe/go/util/kytheuri/uri_test.go
index d93207edc..7bb433da7 100644
--- a/kythe/go/util/kytheuri/uri_test.go
+++ b/kythe/go/util/kytheuri/uri_test.go
@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	spb "kythe.io/kythe/proto/storage_go_proto"
 )
diff --git a/kythe/go/util/span/span_test.go b/kythe/go/util/span/span_test.go
index 6ffc10db6..1d9e9749d 100644
--- a/kythe/go/util/span/span_test.go
+++ b/kythe/go/util/span/span_test.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	cpb "kythe.io/kythe/proto/common_go_proto"
 )
diff --git a/kythe/go/util/tools/print_test_status/BUILD b/kythe/go/util/tools/print_test_status/BUILD
index 1e6f2a393..71b25aa3b 100644
--- a/kythe/go/util/tools/print_test_status/BUILD
+++ b/kythe/go/util/tools/print_test_status/BUILD
@@ -16,6 +16,6 @@ go_binary(
     deps = [
         "//kythe/go/platform/vfs",
         "//third_party/bazel:test_status_go_proto",
-        "@com_github_golang_protobuf//proto:go_default_library",
+        "@org_golang_google_protobuf//proto:go_default_library",
     ],
 )
diff --git a/kythe/go/util/tools/print_test_status/print_test_status.go b/kythe/go/util/tools/print_test_status/print_test_status.go
index a0338e7e5..22dd5b7d8 100644
--- a/kythe/go/util/tools/print_test_status/print_test_status.go
+++ b/kythe/go/util/tools/print_test_status/print_test_status.go
@@ -29,7 +29,7 @@ import (
 
 	"kythe.io/kythe/go/platform/vfs"
 
-	"github.com/golang/protobuf/proto"
+	"google.golang.org/protobuf/proto"
 
 	tspb "kythe.io/third_party/bazel/test_status_go_proto"
 )
diff --git a/third_party/bazel/test_status_go_proto/test_status.pb.go b/third_party/bazel/test_status_go_proto/test_status.pb.go
index f12345b3d..8c03d37ef 100644
--- a/third_party/bazel/test_status_go_proto/test_status.pb.go
+++ b/third_party/bazel/test_status_go_proto/test_status.pb.go
@@ -1,84 +1,92 @@
-// Code generated by protoc-gen-gogo.
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.22.0
+// 	protoc        v30.10.0
 // source: third_party/bazel/src/main/protobuf/test_status.proto
-// DO NOT EDIT!
 
-/*
-	Package test_status_proto is a generated protocol buffer package.
+package blaze
 
-	It is generated from these files:
-		third_party/bazel/src/main/protobuf/test_status.proto
-
-	It has these top-level messages:
-		TestCase
-		TestResultData
-*/
-package test_status_proto
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-import io "io"
+import (
+	proto "github.com/golang/protobuf/proto"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
 
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
-// Status data of test cases which failed (used only for printing test summary)
 type FailedTestCasesStatus int32
 
 const (
-	// * Information about every test case is available.
-	FailedTestCasesStatus_FULL FailedTestCasesStatus = 1
-	// * Information about some test cases may be missing.
-	FailedTestCasesStatus_PARTIAL FailedTestCasesStatus = 2
-	// * No information about individual test cases.
+	FailedTestCasesStatus_FULL          FailedTestCasesStatus = 1
+	FailedTestCasesStatus_PARTIAL       FailedTestCasesStatus = 2
 	FailedTestCasesStatus_NOT_AVAILABLE FailedTestCasesStatus = 3
-	// * This is an empty object still without data.
-	FailedTestCasesStatus_EMPTY FailedTestCasesStatus = 4
+	FailedTestCasesStatus_EMPTY         FailedTestCasesStatus = 4
 )
 
-var FailedTestCasesStatus_name = map[int32]string{
-	1: "FULL",
-	2: "PARTIAL",
-	3: "NOT_AVAILABLE",
-	4: "EMPTY",
-}
-var FailedTestCasesStatus_value = map[string]int32{
-	"FULL":          1,
-	"PARTIAL":       2,
-	"NOT_AVAILABLE": 3,
-	"EMPTY":         4,
-}
+// Enum value maps for FailedTestCasesStatus.
+var (
+	FailedTestCasesStatus_name = map[int32]string{
+		1: "FULL",
+		2: "PARTIAL",
+		3: "NOT_AVAILABLE",
+		4: "EMPTY",
+	}
+	FailedTestCasesStatus_value = map[string]int32{
+		"FULL":          1,
+		"PARTIAL":       2,
+		"NOT_AVAILABLE": 3,
+		"EMPTY":         4,
+	}
+)
 
 func (x FailedTestCasesStatus) Enum() *FailedTestCasesStatus {
 	p := new(FailedTestCasesStatus)
 	*p = x
 	return p
 }
+
 func (x FailedTestCasesStatus) String() string {
-	return proto.EnumName(FailedTestCasesStatus_name, int32(x))
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (FailedTestCasesStatus) Descriptor() protoreflect.EnumDescriptor {
+	return file_third_party_bazel_src_main_protobuf_test_status_proto_enumTypes[0].Descriptor()
+}
+
+func (FailedTestCasesStatus) Type() protoreflect.EnumType {
+	return &file_third_party_bazel_src_main_protobuf_test_status_proto_enumTypes[0]
+}
+
+func (x FailedTestCasesStatus) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
 }
-func (x *FailedTestCasesStatus) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FailedTestCasesStatus_value, data, "FailedTestCasesStatus")
+
+// Deprecated: Do not use.
+func (x *FailedTestCasesStatus) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
 	if err != nil {
 		return err
 	}
-	*x = FailedTestCasesStatus(value)
+	*x = FailedTestCasesStatus(num)
 	return nil
 }
+
+// Deprecated: Use FailedTestCasesStatus.Descriptor instead.
 func (FailedTestCasesStatus) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptorTestStatus, []int{0}
+	return file_third_party_bazel_src_main_protobuf_test_status_proto_rawDescGZIP(), []int{0}
 }
 
-// Detailed status data for a TestRunnerAction execution.
 type BlazeTestStatus int32
 
 const (
@@ -93,46 +101,68 @@ const (
 	BlazeTestStatus_BLAZE_HALTED_BEFORE_TESTING BlazeTestStatus = 8
 )
 
-var BlazeTestStatus_name = map[int32]string{
-	0: "NO_STATUS",
-	1: "PASSED",
-	2: "FLAKY",
-	3: "TIMEOUT",
-	4: "FAILED",
-	5: "INCOMPLETE",
-	6: "REMOTE_FAILURE",
-	7: "FAILED_TO_BUILD",
-	8: "BLAZE_HALTED_BEFORE_TESTING",
-}
-var BlazeTestStatus_value = map[string]int32{
-	"NO_STATUS":                   0,
-	"PASSED":                      1,
-	"FLAKY":                       2,
-	"TIMEOUT":                     3,
-	"FAILED":                      4,
-	"INCOMPLETE":                  5,
-	"REMOTE_FAILURE":              6,
-	"FAILED_TO_BUILD":             7,
-	"BLAZE_HALTED_BEFORE_TESTING": 8,
-}
+// Enum value maps for BlazeTestStatus.
+var (
+	BlazeTestStatus_name = map[int32]string{
+		0: "NO_STATUS",
+		1: "PASSED",
+		2: "FLAKY",
+		3: "TIMEOUT",
+		4: "FAILED",
+		5: "INCOMPLETE",
+		6: "REMOTE_FAILURE",
+		7: "FAILED_TO_BUILD",
+		8: "BLAZE_HALTED_BEFORE_TESTING",
+	}
+	BlazeTestStatus_value = map[string]int32{
+		"NO_STATUS":                   0,
+		"PASSED":                      1,
+		"FLAKY":                       2,
+		"TIMEOUT":                     3,
+		"FAILED":                      4,
+		"INCOMPLETE":                  5,
+		"REMOTE_FAILURE":              6,
+		"FAILED_TO_BUILD":             7,
+		"BLAZE_HALTED_BEFORE_TESTING": 8,
+	}
+)
 
 func (x BlazeTestStatus) Enum() *BlazeTestStatus {
 	p := new(BlazeTestStatus)
 	*p = x
 	return p
 }
+
 func (x BlazeTestStatus) String() string {
-	return proto.EnumName(BlazeTestStatus_name, int32(x))
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (BlazeTestStatus) Descriptor() protoreflect.EnumDescriptor {
+	return file_third_party_bazel_src_main_protobuf_test_status_proto_enumTypes[1].Descriptor()
 }
-func (x *BlazeTestStatus) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(BlazeTestStatus_value, data, "BlazeTestStatus")
+
+func (BlazeTestStatus) Type() protoreflect.EnumType {
+	return &file_third_party_bazel_src_main_protobuf_test_status_proto_enumTypes[1]
+}
+
+func (x BlazeTestStatus) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *BlazeTestStatus) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
 	if err != nil {
 		return err
 	}
-	*x = BlazeTestStatus(value)
+	*x = BlazeTestStatus(num)
 	return nil
 }
-func (BlazeTestStatus) EnumDescriptor() ([]byte, []int) { return fileDescriptorTestStatus, []int{1} }
+
+// Deprecated: Use BlazeTestStatus.Descriptor instead.
+func (BlazeTestStatus) EnumDescriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_test_status_proto_rawDescGZIP(), []int{1}
+}
 
 type TestCase_Type int32
 
@@ -143,36 +173,58 @@ const (
 	TestCase_UNKNOWN        TestCase_Type = 3
 )
 
-var TestCase_Type_name = map[int32]string{
-	0: "TEST_CASE",
-	1: "TEST_SUITE",
-	2: "TEST_DECORATOR",
-	3: "UNKNOWN",
-}
-var TestCase_Type_value = map[string]int32{
-	"TEST_CASE":      0,
-	"TEST_SUITE":     1,
-	"TEST_DECORATOR": 2,
-	"UNKNOWN":        3,
-}
+// Enum value maps for TestCase_Type.
+var (
+	TestCase_Type_name = map[int32]string{
+		0: "TEST_CASE",
+		1: "TEST_SUITE",
+		2: "TEST_DECORATOR",
+		3: "UNKNOWN",
+	}
+	TestCase_Type_value = map[string]int32{
+		"TEST_CASE":      0,
+		"TEST_SUITE":     1,
+		"TEST_DECORATOR": 2,
+		"UNKNOWN":        3,
+	}
+)
 
 func (x TestCase_Type) Enum() *TestCase_Type {
 	p := new(TestCase_Type)
 	*p = x
 	return p
 }
+
 func (x TestCase_Type) String() string {
-	return proto.EnumName(TestCase_Type_name, int32(x))
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (TestCase_Type) Descriptor() protoreflect.EnumDescriptor {
+	return file_third_party_bazel_src_main_protobuf_test_status_proto_enumTypes[2].Descriptor()
+}
+
+func (TestCase_Type) Type() protoreflect.EnumType {
+	return &file_third_party_bazel_src_main_protobuf_test_status_proto_enumTypes[2]
 }
-func (x *TestCase_Type) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(TestCase_Type_value, data, "TestCase_Type")
+
+func (x TestCase_Type) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Do not use.
+func (x *TestCase_Type) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
 	if err != nil {
 		return err
 	}
-	*x = TestCase_Type(value)
+	*x = TestCase_Type(num)
 	return nil
 }
-func (TestCase_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptorTestStatus, []int{0, 0} }
+
+// Deprecated: Use TestCase_Type.Descriptor instead.
+func (TestCase_Type) EnumDescriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_test_status_proto_rawDescGZIP(), []int{0, 0}
+}
 
 type TestCase_Status int32
 
@@ -182,39 +234,62 @@ const (
 	TestCase_ERROR  TestCase_Status = 2
 )
 
-var TestCase_Status_name = map[int32]string{
-	0: "PASSED",
-	1: "FAILED",
-	2: "ERROR",
-}
-var TestCase_Status_value = map[string]int32{
-	"PASSED": 0,
-	"FAILED": 1,
-	"ERROR":  2,
-}
+// Enum value maps for TestCase_Status.
+var (
+	TestCase_Status_name = map[int32]string{
+		0: "PASSED",
+		1: "FAILED",
+		2: "ERROR",
+	}
+	TestCase_Status_value = map[string]int32{
+		"PASSED": 0,
+		"FAILED": 1,
+		"ERROR":  2,
+	}
+)
 
 func (x TestCase_Status) Enum() *TestCase_Status {
 	p := new(TestCase_Status)
 	*p = x
 	return p
 }
+
 func (x TestCase_Status) String() string {
-	return proto.EnumName(TestCase_Status_name, int32(x))
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
+}
+
+func (TestCase_Status) Descriptor() protoreflect.EnumDescriptor {
+	return file_third_party_bazel_src_main_protobuf_test_status_proto_enumTypes[3].Descriptor()
+}
+
+func (TestCase_Status) Type() protoreflect.EnumType {
+	return &file_third_party_bazel_src_main_protobuf_test_status_proto_enumTypes[3]
+}
+
+func (x TestCase_Status) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
 }
-func (x *TestCase_Status) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(TestCase_Status_value, data, "TestCase_Status")
+
+// Deprecated: Do not use.
+func (x *TestCase_Status) UnmarshalJSON(b []byte) error {
+	num, err := protoimpl.X.UnmarshalJSONEnum(x.Descriptor(), b)
 	if err != nil {
 		return err
 	}
-	*x = TestCase_Status(value)
+	*x = TestCase_Status(num)
 	return nil
 }
-func (TestCase_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptorTestStatus, []int{0, 1} }
 
-// TestCase contains detailed data about all tests (cases/suites/decorators)
-// ran, structured in a tree. This data will be later used to present the tests
-// by the web status server.
+// Deprecated: Use TestCase_Status.Descriptor instead.
+func (TestCase_Status) EnumDescriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_test_status_proto_rawDescGZIP(), []int{0, 1}
+}
+
 type TestCase struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	Child             []*TestCase      `protobuf:"bytes,1,rep,name=child" json:"child,omitempty"`
 	Name              *string          `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
 	ClassName         *string          `protobuf:"bytes,3,opt,name=class_name,json=className" json:"class_name,omitempty"`
@@ -223,1495 +298,442 @@ type TestCase struct {
 	Type              *TestCase_Type   `protobuf:"varint,6,opt,name=type,enum=blaze.TestCase_Type" json:"type,omitempty"`
 	Status            *TestCase_Status `protobuf:"varint,7,opt,name=status,enum=blaze.TestCase_Status" json:"status,omitempty"`
 	Run               *bool            `protobuf:"varint,8,opt,name=run,def=1" json:"run,omitempty"`
-	XXX_unrecognized  []byte           `json:"-"`
 }
 
-func (m *TestCase) Reset()                    { *m = TestCase{} }
-func (m *TestCase) String() string            { return proto.CompactTextString(m) }
-func (*TestCase) ProtoMessage()               {}
-func (*TestCase) Descriptor() ([]byte, []int) { return fileDescriptorTestStatus, []int{0} }
+// Default values for TestCase fields.
+const (
+	Default_TestCase_Run = bool(true)
+)
+
+func (x *TestCase) Reset() {
+	*x = TestCase{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_third_party_bazel_src_main_protobuf_test_status_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TestCase) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
 
-const Default_TestCase_Run bool = true
+func (*TestCase) ProtoMessage() {}
+
+func (x *TestCase) ProtoReflect() protoreflect.Message {
+	mi := &file_third_party_bazel_src_main_protobuf_test_status_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TestCase.ProtoReflect.Descriptor instead.
+func (*TestCase) Descriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_test_status_proto_rawDescGZIP(), []int{0}
+}
 
-func (m *TestCase) GetChild() []*TestCase {
-	if m != nil {
-		return m.Child
+func (x *TestCase) GetChild() []*TestCase {
+	if x != nil {
+		return x.Child
 	}
 	return nil
 }
 
-func (m *TestCase) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
+func (x *TestCase) GetName() string {
+	if x != nil && x.Name != nil {
+		return *x.Name
 	}
 	return ""
 }
 
-func (m *TestCase) GetClassName() string {
-	if m != nil && m.ClassName != nil {
-		return *m.ClassName
+func (x *TestCase) GetClassName() string {
+	if x != nil && x.ClassName != nil {
+		return *x.ClassName
 	}
 	return ""
 }
 
-func (m *TestCase) GetRunDurationMillis() int64 {
-	if m != nil && m.RunDurationMillis != nil {
-		return *m.RunDurationMillis
+func (x *TestCase) GetRunDurationMillis() int64 {
+	if x != nil && x.RunDurationMillis != nil {
+		return *x.RunDurationMillis
 	}
 	return 0
 }
 
-func (m *TestCase) GetResult() string {
-	if m != nil && m.Result != nil {
-		return *m.Result
+func (x *TestCase) GetResult() string {
+	if x != nil && x.Result != nil {
+		return *x.Result
 	}
 	return ""
 }
 
-func (m *TestCase) GetType() TestCase_Type {
-	if m != nil && m.Type != nil {
-		return *m.Type
+func (x *TestCase) GetType() TestCase_Type {
+	if x != nil && x.Type != nil {
+		return *x.Type
 	}
 	return TestCase_TEST_CASE
 }
 
-func (m *TestCase) GetStatus() TestCase_Status {
-	if m != nil && m.Status != nil {
-		return *m.Status
+func (x *TestCase) GetStatus() TestCase_Status {
+	if x != nil && x.Status != nil {
+		return *x.Status
 	}
 	return TestCase_PASSED
 }
 
-func (m *TestCase) GetRun() bool {
-	if m != nil && m.Run != nil {
-		return *m.Run
+func (x *TestCase) GetRun() bool {
+	if x != nil && x.Run != nil {
+		return *x.Run
 	}
 	return Default_TestCase_Run
 }
 
-// TestResultData holds the outcome data for a single test action (A
-// single test rule can result in multiple actions due to sharding and
-// runs_per_test settings.)
 type TestResultData struct {
-	// The following two fields are used for TestRunnerAction caching.
-	// This reflects the fact that failing tests are successful
-	// actions that might be cached, depending on option settings.
-	Cachable   *bool `protobuf:"varint,1,opt,name=cachable" json:"cachable,omitempty"`
-	TestPassed *bool `protobuf:"varint,2,opt,name=test_passed,json=testPassed" json:"test_passed,omitempty"`
-	// Following data is informational.
-	Status      *BlazeTestStatus `protobuf:"varint,3,opt,name=status,enum=blaze.BlazeTestStatus,def=0" json:"status,omitempty"`
-	FailedLogs  []string         `protobuf:"bytes,4,rep,name=failed_logs,json=failedLogs" json:"failed_logs,omitempty"`
-	Warning     []string         `protobuf:"bytes,5,rep,name=warning" json:"warning,omitempty"`
-	HasCoverage *bool            `protobuf:"varint,6,opt,name=has_coverage,json=hasCoverage" json:"has_coverage,omitempty"`
-	// Returns if this was cached in remote execution.
-	RemotelyCached *bool `protobuf:"varint,7,opt,name=remotely_cached,json=remotelyCached" json:"remotely_cached,omitempty"`
-	// Returns true if this was executed remotely
-	IsRemoteStrategy *bool `protobuf:"varint,8,opt,name=is_remote_strategy,json=isRemoteStrategy" json:"is_remote_strategy,omitempty"`
-	// All associated test times (in ms).
-	TestTimes []int64 `protobuf:"varint,9,rep,name=test_times,json=testTimes" json:"test_times,omitempty"`
-	// Passed log paths. Set if the test passed.
-	PassedLog *string `protobuf:"bytes,10,opt,name=passed_log,json=passedLog" json:"passed_log,omitempty"`
-	// Test times, without remote execution overhead (in ms).
-	TestProcessTimes []int64 `protobuf:"varint,11,rep,name=test_process_times,json=testProcessTimes" json:"test_process_times,omitempty"`
-	// Total time in ms.
-	RunDurationMillis *int64 `protobuf:"varint,12,opt,name=run_duration_millis,json=runDurationMillis" json:"run_duration_millis,omitempty"`
-	// Start time of the test action in ms since the epoch.
-	StartTimeMillisEpoch *int64 `protobuf:"varint,15,opt,name=start_time_millis_epoch,json=startTimeMillisEpoch" json:"start_time_millis_epoch,omitempty"`
-	// Additional build info
-	TestCase         *TestCase              `protobuf:"bytes,13,opt,name=test_case,json=testCase" json:"test_case,omitempty"`
-	FailedStatus     *FailedTestCasesStatus `protobuf:"varint,14,opt,name=failed_status,json=failedStatus,enum=blaze.FailedTestCasesStatus" json:"failed_status,omitempty"`
-	XXX_unrecognized []byte                 `json:"-"`
-}
-
-func (m *TestResultData) Reset()                    { *m = TestResultData{} }
-func (m *TestResultData) String() string            { return proto.CompactTextString(m) }
-func (*TestResultData) ProtoMessage()               {}
-func (*TestResultData) Descriptor() ([]byte, []int) { return fileDescriptorTestStatus, []int{1} }
-
-const Default_TestResultData_Status BlazeTestStatus = BlazeTestStatus_NO_STATUS
-
-func (m *TestResultData) GetCachable() bool {
-	if m != nil && m.Cachable != nil {
-		return *m.Cachable
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Cachable             *bool                  `protobuf:"varint,1,opt,name=cachable" json:"cachable,omitempty"`
+	TestPassed           *bool                  `protobuf:"varint,2,opt,name=test_passed,json=testPassed" json:"test_passed,omitempty"`
+	Status               *BlazeTestStatus       `protobuf:"varint,3,opt,name=status,enum=blaze.BlazeTestStatus,def=0" json:"status,omitempty"`
+	FailedLogs           []string               `protobuf:"bytes,4,rep,name=failed_logs,json=failedLogs" json:"failed_logs,omitempty"`
+	Warning              []string               `protobuf:"bytes,5,rep,name=warning" json:"warning,omitempty"`
+	HasCoverage          *bool                  `protobuf:"varint,6,opt,name=has_coverage,json=hasCoverage" json:"has_coverage,omitempty"`
+	RemotelyCached       *bool                  `protobuf:"varint,7,opt,name=remotely_cached,json=remotelyCached" json:"remotely_cached,omitempty"`
+	IsRemoteStrategy     *bool                  `protobuf:"varint,8,opt,name=is_remote_strategy,json=isRemoteStrategy" json:"is_remote_strategy,omitempty"`
+	TestTimes            []int64                `protobuf:"varint,9,rep,name=test_times,json=testTimes" json:"test_times,omitempty"`
+	PassedLog            *string                `protobuf:"bytes,10,opt,name=passed_log,json=passedLog" json:"passed_log,omitempty"`
+	TestProcessTimes     []int64                `protobuf:"varint,11,rep,name=test_process_times,json=testProcessTimes" json:"test_process_times,omitempty"`
+	RunDurationMillis    *int64                 `protobuf:"varint,12,opt,name=run_duration_millis,json=runDurationMillis" json:"run_duration_millis,omitempty"`
+	StartTimeMillisEpoch *int64                 `protobuf:"varint,15,opt,name=start_time_millis_epoch,json=startTimeMillisEpoch" json:"start_time_millis_epoch,omitempty"`
+	TestCase             *TestCase              `protobuf:"bytes,13,opt,name=test_case,json=testCase" json:"test_case,omitempty"`
+	FailedStatus         *FailedTestCasesStatus `protobuf:"varint,14,opt,name=failed_status,json=failedStatus,enum=blaze.FailedTestCasesStatus" json:"failed_status,omitempty"`
+}
+
+// Default values for TestResultData fields.
+const (
+	Default_TestResultData_Status = BlazeTestStatus_NO_STATUS
+)
+
+func (x *TestResultData) Reset() {
+	*x = TestResultData{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_third_party_bazel_src_main_protobuf_test_status_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TestResultData) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TestResultData) ProtoMessage() {}
+
+func (x *TestResultData) ProtoReflect() protoreflect.Message {
+	mi := &file_third_party_bazel_src_main_protobuf_test_status_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TestResultData.ProtoReflect.Descriptor instead.
+func (*TestResultData) Descriptor() ([]byte, []int) {
+	return file_third_party_bazel_src_main_protobuf_test_status_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *TestResultData) GetCachable() bool {
+	if x != nil && x.Cachable != nil {
+		return *x.Cachable
 	}
 	return false
 }
 
-func (m *TestResultData) GetTestPassed() bool {
-	if m != nil && m.TestPassed != nil {
-		return *m.TestPassed
+func (x *TestResultData) GetTestPassed() bool {
+	if x != nil && x.TestPassed != nil {
+		return *x.TestPassed
 	}
 	return false
 }
 
-func (m *TestResultData) GetStatus() BlazeTestStatus {
-	if m != nil && m.Status != nil {
-		return *m.Status
+func (x *TestResultData) GetStatus() BlazeTestStatus {
+	if x != nil && x.Status != nil {
+		return *x.Status
 	}
 	return Default_TestResultData_Status
 }
 
-func (m *TestResultData) GetFailedLogs() []string {
-	if m != nil {
-		return m.FailedLogs
+func (x *TestResultData) GetFailedLogs() []string {
+	if x != nil {
+		return x.FailedLogs
 	}
 	return nil
 }
 
-func (m *TestResultData) GetWarning() []string {
-	if m != nil {
-		return m.Warning
+func (x *TestResultData) GetWarning() []string {
+	if x != nil {
+		return x.Warning
 	}
 	return nil
 }
 
-func (m *TestResultData) GetHasCoverage() bool {
-	if m != nil && m.HasCoverage != nil {
-		return *m.HasCoverage
+func (x *TestResultData) GetHasCoverage() bool {
+	if x != nil && x.HasCoverage != nil {
+		return *x.HasCoverage
 	}
 	return false
 }
 
-func (m *TestResultData) GetRemotelyCached() bool {
-	if m != nil && m.RemotelyCached != nil {
-		return *m.RemotelyCached
+func (x *TestResultData) GetRemotelyCached() bool {
+	if x != nil && x.RemotelyCached != nil {
+		return *x.RemotelyCached
 	}
 	return false
 }
 
-func (m *TestResultData) GetIsRemoteStrategy() bool {
-	if m != nil && m.IsRemoteStrategy != nil {
-		return *m.IsRemoteStrategy
+func (x *TestResultData) GetIsRemoteStrategy() bool {
+	if x != nil && x.IsRemoteStrategy != nil {
+		return *x.IsRemoteStrategy
 	}
 	return false
 }
 
-func (m *TestResultData) GetTestTimes() []int64 {
-	if m != nil {
-		return m.TestTimes
+func (x *TestResultData) GetTestTimes() []int64 {
+	if x != nil {
+		return x.TestTimes
 	}
 	return nil
 }
 
-func (m *TestResultData) GetPassedLog() string {
-	if m != nil && m.PassedLog != nil {
-		return *m.PassedLog
+func (x *TestResultData) GetPassedLog() string {
+	if x != nil && x.PassedLog != nil {
+		return *x.PassedLog
 	}
 	return ""
 }
 
-func (m *TestResultData) GetTestProcessTimes() []int64 {
-	if m != nil {
-		return m.TestProcessTimes
+func (x *TestResultData) GetTestProcessTimes() []int64 {
+	if x != nil {
+		return x.TestProcessTimes
 	}
 	return nil
 }
 
-func (m *TestResultData) GetRunDurationMillis() int64 {
-	if m != nil && m.RunDurationMillis != nil {
-		return *m.RunDurationMillis
+func (x *TestResultData) GetRunDurationMillis() int64 {
+	if x != nil && x.RunDurationMillis != nil {
+		return *x.RunDurationMillis
 	}
 	return 0
 }
 
-func (m *TestResultData) GetStartTimeMillisEpoch() int64 {
-	if m != nil && m.StartTimeMillisEpoch != nil {
-		return *m.StartTimeMillisEpoch
+func (x *TestResultData) GetStartTimeMillisEpoch() int64 {
+	if x != nil && x.StartTimeMillisEpoch != nil {
+		return *x.StartTimeMillisEpoch
 	}
 	return 0
 }
 
-func (m *TestResultData) GetTestCase() *TestCase {
-	if m != nil {
-		return m.TestCase
+func (x *TestResultData) GetTestCase() *TestCase {
+	if x != nil {
+		return x.TestCase
 	}
 	return nil
 }
 
-func (m *TestResultData) GetFailedStatus() FailedTestCasesStatus {
-	if m != nil && m.FailedStatus != nil {
-		return *m.FailedStatus
+func (x *TestResultData) GetFailedStatus() FailedTestCasesStatus {
+	if x != nil && x.FailedStatus != nil {
+		return *x.FailedStatus
 	}
 	return FailedTestCasesStatus_FULL
 }
 
-func init() {
-	proto.RegisterType((*TestCase)(nil), "blaze.TestCase")
-	proto.RegisterType((*TestResultData)(nil), "blaze.TestResultData")
-	proto.RegisterEnum("blaze.FailedTestCasesStatus", FailedTestCasesStatus_name, FailedTestCasesStatus_value)
-	proto.RegisterEnum("blaze.BlazeTestStatus", BlazeTestStatus_name, BlazeTestStatus_value)
-	proto.RegisterEnum("blaze.TestCase_Type", TestCase_Type_name, TestCase_Type_value)
-	proto.RegisterEnum("blaze.TestCase_Status", TestCase_Status_name, TestCase_Status_value)
-}
-func (m *TestCase) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalTo(dAtA)
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *TestCase) MarshalTo(dAtA []byte) (int, error) {
-	var i int
-	_ = i
-	var l int
-	_ = l
-	if len(m.Child) > 0 {
-		for _, msg := range m.Child {
-			dAtA[i] = 0xa
-			i++
-			i = encodeVarintTestStatus(dAtA, i, uint64(msg.Size()))
-			n, err := msg.MarshalTo(dAtA[i:])
-			if err != nil {
-				return 0, err
-			}
-			i += n
-		}
-	}
-	if m.Name != nil {
-		dAtA[i] = 0x12
-		i++
-		i = encodeVarintTestStatus(dAtA, i, uint64(len(*m.Name)))
-		i += copy(dAtA[i:], *m.Name)
-	}
-	if m.ClassName != nil {
-		dAtA[i] = 0x1a
-		i++
-		i = encodeVarintTestStatus(dAtA, i, uint64(len(*m.ClassName)))
-		i += copy(dAtA[i:], *m.ClassName)
-	}
-	if m.RunDurationMillis != nil {
-		dAtA[i] = 0x20
-		i++
-		i = encodeVarintTestStatus(dAtA, i, uint64(*m.RunDurationMillis))
-	}
-	if m.Result != nil {
-		dAtA[i] = 0x2a
-		i++
-		i = encodeVarintTestStatus(dAtA, i, uint64(len(*m.Result)))
-		i += copy(dAtA[i:], *m.Result)
-	}
-	if m.Type != nil {
-		dAtA[i] = 0x30
-		i++
-		i = encodeVarintTestStatus(dAtA, i, uint64(*m.Type))
-	}
-	if m.Status != nil {
-		dAtA[i] = 0x38
-		i++
-		i = encodeVarintTestStatus(dAtA, i, uint64(*m.Status))
-	}
-	if m.Run != nil {
-		dAtA[i] = 0x40
-		i++
-		if *m.Run {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i++
-	}
-	if m.XXX_unrecognized != nil {
-		i += copy(dAtA[i:], m.XXX_unrecognized)
-	}
-	return i, nil
-}
-
-func (m *TestResultData) Marshal() (dAtA []byte, err error) {
-	size := m.Size()
-	dAtA = make([]byte, size)
-	n, err := m.MarshalTo(dAtA)
-	if err != nil {
-		return nil, err
-	}
-	return dAtA[:n], nil
-}
-
-func (m *TestResultData) MarshalTo(dAtA []byte) (int, error) {
-	var i int
-	_ = i
-	var l int
-	_ = l
-	if m.Cachable != nil {
-		dAtA[i] = 0x8
-		i++
-		if *m.Cachable {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i++
-	}
-	if m.TestPassed != nil {
-		dAtA[i] = 0x10
-		i++
-		if *m.TestPassed {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i++
-	}
-	if m.Status != nil {
-		dAtA[i] = 0x18
-		i++
-		i = encodeVarintTestStatus(dAtA, i, uint64(*m.Status))
-	}
-	if len(m.FailedLogs) > 0 {
-		for _, s := range m.FailedLogs {
-			dAtA[i] = 0x22
-			i++
-			l = len(s)
-			for l >= 1<<7 {
-				dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
-				l >>= 7
-				i++
-			}
-			dAtA[i] = uint8(l)
-			i++
-			i += copy(dAtA[i:], s)
-		}
-	}
-	if len(m.Warning) > 0 {
-		for _, s := range m.Warning {
-			dAtA[i] = 0x2a
-			i++
-			l = len(s)
-			for l >= 1<<7 {
-				dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
-				l >>= 7
-				i++
-			}
-			dAtA[i] = uint8(l)
-			i++
-			i += copy(dAtA[i:], s)
-		}
-	}
-	if m.HasCoverage != nil {
-		dAtA[i] = 0x30
-		i++
-		if *m.HasCoverage {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i++
-	}
-	if m.RemotelyCached != nil {
-		dAtA[i] = 0x38
-		i++
-		if *m.RemotelyCached {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i++
-	}
-	if m.IsRemoteStrategy != nil {
-		dAtA[i] = 0x40
-		i++
-		if *m.IsRemoteStrategy {
-			dAtA[i] = 1
-		} else {
-			dAtA[i] = 0
-		}
-		i++
-	}
-	if len(m.TestTimes) > 0 {
-		for _, num := range m.TestTimes {
-			dAtA[i] = 0x48
-			i++
-			i = encodeVarintTestStatus(dAtA, i, uint64(num))
-		}
-	}
-	if m.PassedLog != nil {
-		dAtA[i] = 0x52
-		i++
-		i = encodeVarintTestStatus(dAtA, i, uint64(len(*m.PassedLog)))
-		i += copy(dAtA[i:], *m.PassedLog)
-	}
-	if len(m.TestProcessTimes) > 0 {
-		for _, num := range m.TestProcessTimes {
-			dAtA[i] = 0x58
-			i++
-			i = encodeVarintTestStatus(dAtA, i, uint64(num))
-		}
-	}
-	if m.RunDurationMillis != nil {
-		dAtA[i] = 0x60
-		i++
-		i = encodeVarintTestStatus(dAtA, i, uint64(*m.RunDurationMillis))
-	}
-	if m.TestCase != nil {
-		dAtA[i] = 0x6a
-		i++
-		i = encodeVarintTestStatus(dAtA, i, uint64(m.TestCase.Size()))
-		n1, err := m.TestCase.MarshalTo(dAtA[i:])
-		if err != nil {
-			return 0, err
-		}
-		i += n1
-	}
-	if m.FailedStatus != nil {
-		dAtA[i] = 0x70
-		i++
-		i = encodeVarintTestStatus(dAtA, i, uint64(*m.FailedStatus))
-	}
-	if m.StartTimeMillisEpoch != nil {
-		dAtA[i] = 0x78
-		i++
-		i = encodeVarintTestStatus(dAtA, i, uint64(*m.StartTimeMillisEpoch))
-	}
-	if m.XXX_unrecognized != nil {
-		i += copy(dAtA[i:], m.XXX_unrecognized)
-	}
-	return i, nil
-}
-
-func encodeFixed64TestStatus(dAtA []byte, offset int, v uint64) int {
-	dAtA[offset] = uint8(v)
-	dAtA[offset+1] = uint8(v >> 8)
-	dAtA[offset+2] = uint8(v >> 16)
-	dAtA[offset+3] = uint8(v >> 24)
-	dAtA[offset+4] = uint8(v >> 32)
-	dAtA[offset+5] = uint8(v >> 40)
-	dAtA[offset+6] = uint8(v >> 48)
-	dAtA[offset+7] = uint8(v >> 56)
-	return offset + 8
-}
-func encodeFixed32TestStatus(dAtA []byte, offset int, v uint32) int {
-	dAtA[offset] = uint8(v)
-	dAtA[offset+1] = uint8(v >> 8)
-	dAtA[offset+2] = uint8(v >> 16)
-	dAtA[offset+3] = uint8(v >> 24)
-	return offset + 4
-}
-func encodeVarintTestStatus(dAtA []byte, offset int, v uint64) int {
-	for v >= 1<<7 {
-		dAtA[offset] = uint8(v&0x7f | 0x80)
-		v >>= 7
-		offset++
-	}
-	dAtA[offset] = uint8(v)
-	return offset + 1
-}
-func (m *TestCase) Size() (n int) {
-	var l int
-	_ = l
-	if len(m.Child) > 0 {
-		for _, e := range m.Child {
-			l = e.Size()
-			n += 1 + l + sovTestStatus(uint64(l))
-		}
-	}
-	if m.Name != nil {
-		l = len(*m.Name)
-		n += 1 + l + sovTestStatus(uint64(l))
-	}
-	if m.ClassName != nil {
-		l = len(*m.ClassName)
-		n += 1 + l + sovTestStatus(uint64(l))
-	}
-	if m.RunDurationMillis != nil {
-		n += 1 + sovTestStatus(uint64(*m.RunDurationMillis))
-	}
-	if m.Result != nil {
-		l = len(*m.Result)
-		n += 1 + l + sovTestStatus(uint64(l))
-	}
-	if m.Type != nil {
-		n += 1 + sovTestStatus(uint64(*m.Type))
-	}
-	if m.Status != nil {
-		n += 1 + sovTestStatus(uint64(*m.Status))
-	}
-	if m.Run != nil {
-		n += 2
-	}
-	if m.XXX_unrecognized != nil {
-		n += len(m.XXX_unrecognized)
-	}
-	return n
-}
-
-func (m *TestResultData) Size() (n int) {
-	var l int
-	_ = l
-	if m.Cachable != nil {
-		n += 2
-	}
-	if m.TestPassed != nil {
-		n += 2
-	}
-	if m.Status != nil {
-		n += 1 + sovTestStatus(uint64(*m.Status))
-	}
-	if len(m.FailedLogs) > 0 {
-		for _, s := range m.FailedLogs {
-			l = len(s)
-			n += 1 + l + sovTestStatus(uint64(l))
-		}
-	}
-	if len(m.Warning) > 0 {
-		for _, s := range m.Warning {
-			l = len(s)
-			n += 1 + l + sovTestStatus(uint64(l))
-		}
-	}
-	if m.HasCoverage != nil {
-		n += 2
-	}
-	if m.RemotelyCached != nil {
-		n += 2
-	}
-	if m.IsRemoteStrategy != nil {
-		n += 2
-	}
-	if len(m.TestTimes) > 0 {
-		for _, e := range m.TestTimes {
-			n += 1 + sovTestStatus(uint64(e))
-		}
-	}
-	if m.PassedLog != nil {
-		l = len(*m.PassedLog)
-		n += 1 + l + sovTestStatus(uint64(l))
-	}
-	if len(m.TestProcessTimes) > 0 {
-		for _, e := range m.TestProcessTimes {
-			n += 1 + sovTestStatus(uint64(e))
-		}
-	}
-	if m.RunDurationMillis != nil {
-		n += 1 + sovTestStatus(uint64(*m.RunDurationMillis))
-	}
-	if m.TestCase != nil {
-		l = m.TestCase.Size()
-		n += 1 + l + sovTestStatus(uint64(l))
-	}
-	if m.FailedStatus != nil {
-		n += 1 + sovTestStatus(uint64(*m.FailedStatus))
-	}
-	if m.StartTimeMillisEpoch != nil {
-		n += 1 + sovTestStatus(uint64(*m.StartTimeMillisEpoch))
-	}
-	if m.XXX_unrecognized != nil {
-		n += len(m.XXX_unrecognized)
-	}
-	return n
+var File_third_party_bazel_src_main_protobuf_test_status_proto protoreflect.FileDescriptor
+
+var file_third_party_bazel_src_main_protobuf_test_status_proto_rawDesc = []byte{
+	0x0a, 0x35, 0x74, 0x68, 0x69, 0x72, 0x64, 0x5f, 0x70, 0x61, 0x72, 0x74, 0x79, 0x2f, 0x62, 0x61,
+	0x7a, 0x65, 0x6c, 0x2f, 0x73, 0x72, 0x63, 0x2f, 0x6d, 0x61, 0x69, 0x6e, 0x2f, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x05, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x22, 0x93,
+	0x03, 0x0a, 0x08, 0x54, 0x65, 0x73, 0x74, 0x43, 0x61, 0x73, 0x65, 0x12, 0x25, 0x0a, 0x05, 0x63,
+	0x68, 0x69, 0x6c, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x62, 0x6c, 0x61,
+	0x7a, 0x65, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x43, 0x61, 0x73, 0x65, 0x52, 0x05, 0x63, 0x68, 0x69,
+	0x6c, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x5f,
+	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6c, 0x61, 0x73,
+	0x73, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2e, 0x0a, 0x13, 0x72, 0x75, 0x6e, 0x5f, 0x64, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x11, 0x72, 0x75, 0x6e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d,
+	0x69, 0x6c, 0x6c, 0x69, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x28, 0x0a,
+	0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x62, 0x6c,
+	0x61, 0x7a, 0x65, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x43, 0x61, 0x73, 0x65, 0x2e, 0x54, 0x79, 0x70,
+	0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x2e, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e,
+	0x54, 0x65, 0x73, 0x74, 0x43, 0x61, 0x73, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52,
+	0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x16, 0x0a, 0x03, 0x72, 0x75, 0x6e, 0x18, 0x08,
+	0x20, 0x01, 0x28, 0x08, 0x3a, 0x04, 0x74, 0x72, 0x75, 0x65, 0x52, 0x03, 0x72, 0x75, 0x6e, 0x22,
+	0x46, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0d, 0x0a, 0x09, 0x54, 0x45, 0x53, 0x54, 0x5f,
+	0x43, 0x41, 0x53, 0x45, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x54, 0x45, 0x53, 0x54, 0x5f, 0x53,
+	0x55, 0x49, 0x54, 0x45, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x54, 0x45, 0x53, 0x54, 0x5f, 0x44,
+	0x45, 0x43, 0x4f, 0x52, 0x41, 0x54, 0x4f, 0x52, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e,
+	0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x03, 0x22, 0x2b, 0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x41, 0x53, 0x53, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0a, 0x0a,
+	0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52,
+	0x4f, 0x52, 0x10, 0x02, 0x22, 0x81, 0x05, 0x0a, 0x0e, 0x54, 0x65, 0x73, 0x74, 0x52, 0x65, 0x73,
+	0x75, 0x6c, 0x74, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x61, 0x63, 0x68, 0x61,
+	0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x61, 0x63, 0x68, 0x61,
+	0x62, 0x6c, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x70, 0x61, 0x73, 0x73,
+	0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x74, 0x65, 0x73, 0x74, 0x50, 0x61,
+	0x73, 0x73, 0x65, 0x64, 0x12, 0x39, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x16, 0x2e, 0x62, 0x6c, 0x61, 0x7a, 0x65, 0x2e, 0x42, 0x6c, 0x61,
+	0x7a, 0x65, 0x54, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x3a, 0x09, 0x4e, 0x4f,
+	0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12,
+	0x1f, 0x0a, 0x0b, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x5f, 0x6c, 0x6f, 0x67, 0x73, 0x18, 0x04,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x4c, 0x6f, 0x67, 0x73,
+	0x12, 0x18, 0x0a, 0x07, 0x77, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x07, 0x77, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x12, 0x21, 0x0a, 0x0c, 0x68, 0x61,
+	0x73, 0x5f, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0b, 0x68, 0x61, 0x73, 0x43, 0x6f, 0x76, 0x65, 0x72, 0x61, 0x67, 0x65, 0x12, 0x27, 0x0a,
+	0x0f, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x6c, 0x79, 0x5f, 0x63, 0x61, 0x63, 0x68, 0x65, 0x64,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x72, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x6c, 0x79,
+	0x43, 0x61, 0x63, 0x68, 0x65, 0x64, 0x12, 0x2c, 0x0a, 0x12, 0x69, 0x73, 0x5f, 0x72, 0x65, 0x6d,
+	0x6f, 0x74, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x61, 0x74, 0x65, 0x67, 0x79, 0x18, 0x08, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x10, 0x69, 0x73, 0x52, 0x65, 0x6d, 0x6f, 0x74, 0x65, 0x53, 0x74, 0x72, 0x61,
+	0x74, 0x65, 0x67, 0x79, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x74, 0x69, 0x6d,
+	0x65, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x03, 0x52, 0x09, 0x74, 0x65, 0x73, 0x74, 0x54, 0x69,
+	0x6d, 0x65, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x73, 0x73, 0x65, 0x64, 0x5f, 0x6c, 0x6f,
+	0x67, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x73, 0x73, 0x65, 0x64, 0x4c,
+	0x6f, 0x67, 0x12, 0x2c, 0x0a, 0x12, 0x74, 0x65, 0x73, 0x74, 0x5f, 0x70, 0x72, 0x6f, 0x63, 0x65,
+	0x73, 0x73, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x03, 0x52, 0x10,
+	0x74, 0x65, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x63, 0x65, 0x73, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x73,
+	0x12, 0x2e, 0x0a, 0x13, 0x72, 0x75, 0x6e, 0x5f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x5f, 0x6d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x03, 0x52, 0x11, 0x72,
+	0x75, 0x6e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x69, 0x6c, 0x6c, 0x69, 0x73,
+	0x12, 0x35, 0x0a, 0x17, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6d,
+	0x69, 0x6c, 0x6c, 0x69, 0x73, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x18, 0x0f, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x14, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x4d, 0x69, 0x6c, 0x6c,
+	0x69, 0x73, 0x45, 0x70, 0x6f, 0x63, 0x68, 0x12, 0x2c, 0x0a, 0x09, 0x74, 0x65, 0x73, 0x74, 0x5f,
+	0x63, 0x61, 0x73, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x62, 0x6c, 0x61,
+	0x7a, 0x65, 0x2e, 0x54, 0x65, 0x73, 0x74, 0x43, 0x61, 0x73, 0x65, 0x52, 0x08, 0x74, 0x65, 0x73,
+	0x74, 0x43, 0x61, 0x73, 0x65, 0x12, 0x41, 0x0a, 0x0d, 0x66, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x5f,
+	0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1c, 0x2e, 0x62,
+	0x6c, 0x61, 0x7a, 0x65, 0x2e, 0x46, 0x61, 0x69, 0x6c, 0x65, 0x64, 0x54, 0x65, 0x73, 0x74, 0x43,
+	0x61, 0x73, 0x65, 0x73, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x0c, 0x66, 0x61, 0x69, 0x6c,
+	0x65, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x2a, 0x4c, 0x0a, 0x15, 0x46, 0x61, 0x69, 0x6c,
+	0x65, 0x64, 0x54, 0x65, 0x73, 0x74, 0x43, 0x61, 0x73, 0x65, 0x73, 0x53, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x12, 0x08, 0x0a, 0x04, 0x46, 0x55, 0x4c, 0x4c, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x50,
+	0x41, 0x52, 0x54, 0x49, 0x41, 0x4c, 0x10, 0x02, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x4f, 0x54, 0x5f,
+	0x41, 0x56, 0x41, 0x49, 0x4c, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x45,
+	0x4d, 0x50, 0x54, 0x59, 0x10, 0x04, 0x2a, 0xaa, 0x01, 0x0a, 0x0f, 0x42, 0x6c, 0x61, 0x7a, 0x65,
+	0x54, 0x65, 0x73, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0d, 0x0a, 0x09, 0x4e, 0x4f,
+	0x5f, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x41, 0x53,
+	0x53, 0x45, 0x44, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x46, 0x4c, 0x41, 0x4b, 0x59, 0x10, 0x02,
+	0x12, 0x0b, 0x0a, 0x07, 0x54, 0x49, 0x4d, 0x45, 0x4f, 0x55, 0x54, 0x10, 0x03, 0x12, 0x0a, 0x0a,
+	0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x04, 0x12, 0x0e, 0x0a, 0x0a, 0x49, 0x4e, 0x43,
+	0x4f, 0x4d, 0x50, 0x4c, 0x45, 0x54, 0x45, 0x10, 0x05, 0x12, 0x12, 0x0a, 0x0e, 0x52, 0x45, 0x4d,
+	0x4f, 0x54, 0x45, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x55, 0x52, 0x45, 0x10, 0x06, 0x12, 0x13, 0x0a,
+	0x0f, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x5f, 0x54, 0x4f, 0x5f, 0x42, 0x55, 0x49, 0x4c, 0x44,
+	0x10, 0x07, 0x12, 0x1f, 0x0a, 0x1b, 0x42, 0x4c, 0x41, 0x5a, 0x45, 0x5f, 0x48, 0x41, 0x4c, 0x54,
+	0x45, 0x44, 0x5f, 0x42, 0x45, 0x46, 0x4f, 0x52, 0x45, 0x5f, 0x54, 0x45, 0x53, 0x54, 0x49, 0x4e,
+	0x47, 0x10, 0x08, 0x42, 0x29, 0x0a, 0x27, 0x63, 0x6f, 0x6d, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c,
+	0x65, 0x2e, 0x64, 0x65, 0x76, 0x74, 0x6f, 0x6f, 0x6c, 0x73, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64,
+	0x2e, 0x6c, 0x69, 0x62, 0x2e, 0x76, 0x69, 0x65, 0x77, 0x2e, 0x74, 0x65, 0x73, 0x74,
 }
 
-func sovTestStatus(x uint64) (n int) {
-	for {
-		n++
-		x >>= 7
-		if x == 0 {
-			break
-		}
-	}
-	return n
-}
-func sozTestStatus(x uint64) (n int) {
-	return sovTestStatus(uint64((x << 1) ^ uint64((int64(x) >> 63))))
-}
-func (m *TestCase) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowTestStatus
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: TestCase: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: TestCase: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Child", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthTestStatus
-			}
-			postIndex := iNdEx + msglen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Child = append(m.Child, &TestCase{})
-			if err := m.Child[len(m.Child)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 2:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= (uint64(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTestStatus
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			s := string(dAtA[iNdEx:postIndex])
-			m.Name = &s
-			iNdEx = postIndex
-		case 3:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field ClassName", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= (uint64(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTestStatus
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			s := string(dAtA[iNdEx:postIndex])
-			m.ClassName = &s
-			iNdEx = postIndex
-		case 4:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field RunDurationMillis", wireType)
-			}
-			var v int64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (int64(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			m.RunDurationMillis = &v
-		case 5:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Result", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= (uint64(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTestStatus
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			s := string(dAtA[iNdEx:postIndex])
-			m.Result = &s
-			iNdEx = postIndex
-		case 6:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType)
-			}
-			var v TestCase_Type
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (TestCase_Type(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			m.Type = &v
-		case 7:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType)
-			}
-			var v TestCase_Status
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (TestCase_Status(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			m.Status = &v
-		case 8:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Run", wireType)
-			}
-			var v int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			b := bool(v != 0)
-			m.Run = &b
-		default:
-			iNdEx = preIndex
-			skippy, err := skipTestStatus(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if skippy < 0 {
-				return ErrInvalidLengthTestStatus
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
-			iNdEx += skippy
-		}
-	}
-
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func (m *TestResultData) Unmarshal(dAtA []byte) error {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		preIndex := iNdEx
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return ErrIntOverflowTestStatus
-			}
-			if iNdEx >= l {
-				return io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
-			}
-		}
-		fieldNum := int32(wire >> 3)
-		wireType := int(wire & 0x7)
-		if wireType == 4 {
-			return fmt.Errorf("proto: TestResultData: wiretype end group for non-group")
-		}
-		if fieldNum <= 0 {
-			return fmt.Errorf("proto: TestResultData: illegal tag %d (wire type %d)", fieldNum, wire)
-		}
-		switch fieldNum {
-		case 1:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Cachable", wireType)
-			}
-			var v int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			b := bool(v != 0)
-			m.Cachable = &b
-		case 2:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field TestPassed", wireType)
-			}
-			var v int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			b := bool(v != 0)
-			m.TestPassed = &b
-		case 3:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType)
-			}
-			var v BlazeTestStatus
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (BlazeTestStatus(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			m.Status = &v
-		case 4:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field FailedLogs", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= (uint64(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTestStatus
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.FailedLogs = append(m.FailedLogs, string(dAtA[iNdEx:postIndex]))
-			iNdEx = postIndex
-		case 5:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field Warning", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= (uint64(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTestStatus
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.Warning = append(m.Warning, string(dAtA[iNdEx:postIndex]))
-			iNdEx = postIndex
-		case 6:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field HasCoverage", wireType)
-			}
-			var v int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			b := bool(v != 0)
-			m.HasCoverage = &b
-		case 7:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field RemotelyCached", wireType)
-			}
-			var v int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			b := bool(v != 0)
-			m.RemotelyCached = &b
-		case 8:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field IsRemoteStrategy", wireType)
-			}
-			var v int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			b := bool(v != 0)
-			m.IsRemoteStrategy = &b
-		case 9:
-			if wireType == 0 {
-				var v int64
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowTestStatus
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					v |= (int64(b) & 0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				m.TestTimes = append(m.TestTimes, v)
-			} else if wireType == 2 {
-				var packedLen int
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowTestStatus
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					packedLen |= (int(b) & 0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				if packedLen < 0 {
-					return ErrInvalidLengthTestStatus
-				}
-				postIndex := iNdEx + packedLen
-				if postIndex > l {
-					return io.ErrUnexpectedEOF
-				}
-				for iNdEx < postIndex {
-					var v int64
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowTestStatus
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						v |= (int64(b) & 0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					m.TestTimes = append(m.TestTimes, v)
-				}
-			} else {
-				return fmt.Errorf("proto: wrong wireType = %d for field TestTimes", wireType)
-			}
-		case 10:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field PassedLog", wireType)
-			}
-			var stringLen uint64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				stringLen |= (uint64(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			intStringLen := int(stringLen)
-			if intStringLen < 0 {
-				return ErrInvalidLengthTestStatus
-			}
-			postIndex := iNdEx + intStringLen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			s := string(dAtA[iNdEx:postIndex])
-			m.PassedLog = &s
-			iNdEx = postIndex
-		case 11:
-			if wireType == 0 {
-				var v int64
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowTestStatus
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					v |= (int64(b) & 0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				m.TestProcessTimes = append(m.TestProcessTimes, v)
-			} else if wireType == 2 {
-				var packedLen int
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return ErrIntOverflowTestStatus
-					}
-					if iNdEx >= l {
-						return io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					packedLen |= (int(b) & 0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				if packedLen < 0 {
-					return ErrInvalidLengthTestStatus
-				}
-				postIndex := iNdEx + packedLen
-				if postIndex > l {
-					return io.ErrUnexpectedEOF
-				}
-				for iNdEx < postIndex {
-					var v int64
-					for shift := uint(0); ; shift += 7 {
-						if shift >= 64 {
-							return ErrIntOverflowTestStatus
-						}
-						if iNdEx >= l {
-							return io.ErrUnexpectedEOF
-						}
-						b := dAtA[iNdEx]
-						iNdEx++
-						v |= (int64(b) & 0x7F) << shift
-						if b < 0x80 {
-							break
-						}
-					}
-					m.TestProcessTimes = append(m.TestProcessTimes, v)
-				}
-			} else {
-				return fmt.Errorf("proto: wrong wireType = %d for field TestProcessTimes", wireType)
-			}
-		case 12:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field RunDurationMillis", wireType)
-			}
-			var v int64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (int64(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			m.RunDurationMillis = &v
-		case 13:
-			if wireType != 2 {
-				return fmt.Errorf("proto: wrong wireType = %d for field TestCase", wireType)
-			}
-			var msglen int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				msglen |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			if msglen < 0 {
-				return ErrInvalidLengthTestStatus
-			}
-			postIndex := iNdEx + msglen
-			if postIndex > l {
-				return io.ErrUnexpectedEOF
-			}
-			if m.TestCase == nil {
-				m.TestCase = &TestCase{}
-			}
-			if err := m.TestCase.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
-				return err
-			}
-			iNdEx = postIndex
-		case 14:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field FailedStatus", wireType)
-			}
-			var v FailedTestCasesStatus
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (FailedTestCasesStatus(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			m.FailedStatus = &v
-		case 15:
-			if wireType != 0 {
-				return fmt.Errorf("proto: wrong wireType = %d for field StartTimeMillisEpoch", wireType)
-			}
-			var v int64
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				v |= (int64(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			m.StartTimeMillisEpoch = &v
-		default:
-			iNdEx = preIndex
-			skippy, err := skipTestStatus(dAtA[iNdEx:])
-			if err != nil {
-				return err
-			}
-			if skippy < 0 {
-				return ErrInvalidLengthTestStatus
-			}
-			if (iNdEx + skippy) > l {
-				return io.ErrUnexpectedEOF
-			}
-			m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...)
-			iNdEx += skippy
-		}
-	}
+var (
+	file_third_party_bazel_src_main_protobuf_test_status_proto_rawDescOnce sync.Once
+	file_third_party_bazel_src_main_protobuf_test_status_proto_rawDescData = file_third_party_bazel_src_main_protobuf_test_status_proto_rawDesc
+)
 
-	if iNdEx > l {
-		return io.ErrUnexpectedEOF
-	}
-	return nil
-}
-func skipTestStatus(dAtA []byte) (n int, err error) {
-	l := len(dAtA)
-	iNdEx := 0
-	for iNdEx < l {
-		var wire uint64
-		for shift := uint(0); ; shift += 7 {
-			if shift >= 64 {
-				return 0, ErrIntOverflowTestStatus
-			}
-			if iNdEx >= l {
-				return 0, io.ErrUnexpectedEOF
-			}
-			b := dAtA[iNdEx]
-			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
-			if b < 0x80 {
-				break
+func file_third_party_bazel_src_main_protobuf_test_status_proto_rawDescGZIP() []byte {
+	file_third_party_bazel_src_main_protobuf_test_status_proto_rawDescOnce.Do(func() {
+		file_third_party_bazel_src_main_protobuf_test_status_proto_rawDescData = protoimpl.X.CompressGZIP(file_third_party_bazel_src_main_protobuf_test_status_proto_rawDescData)
+	})
+	return file_third_party_bazel_src_main_protobuf_test_status_proto_rawDescData
+}
+
+var file_third_party_bazel_src_main_protobuf_test_status_proto_enumTypes = make([]protoimpl.EnumInfo, 4)
+var file_third_party_bazel_src_main_protobuf_test_status_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_third_party_bazel_src_main_protobuf_test_status_proto_goTypes = []interface{}{
+	(FailedTestCasesStatus)(0), // 0: blaze.FailedTestCasesStatus
+	(BlazeTestStatus)(0),       // 1: blaze.BlazeTestStatus
+	(TestCase_Type)(0),         // 2: blaze.TestCase.Type
+	(TestCase_Status)(0),       // 3: blaze.TestCase.Status
+	(*TestCase)(nil),           // 4: blaze.TestCase
+	(*TestResultData)(nil),     // 5: blaze.TestResultData
+}
+var file_third_party_bazel_src_main_protobuf_test_status_proto_depIdxs = []int32{
+	4, // 0: blaze.TestCase.child:type_name -> blaze.TestCase
+	2, // 1: blaze.TestCase.type:type_name -> blaze.TestCase.Type
+	3, // 2: blaze.TestCase.status:type_name -> blaze.TestCase.Status
+	1, // 3: blaze.TestResultData.status:type_name -> blaze.BlazeTestStatus
+	4, // 4: blaze.TestResultData.test_case:type_name -> blaze.TestCase
+	0, // 5: blaze.TestResultData.failed_status:type_name -> blaze.FailedTestCasesStatus
+	6, // [6:6] is the sub-list for method output_type
+	6, // [6:6] is the sub-list for method input_type
+	6, // [6:6] is the sub-list for extension type_name
+	6, // [6:6] is the sub-list for extension extendee
+	0, // [0:6] is the sub-list for field type_name
+}
+
+func init() { file_third_party_bazel_src_main_protobuf_test_status_proto_init() }
+func file_third_party_bazel_src_main_protobuf_test_status_proto_init() {
+	if File_third_party_bazel_src_main_protobuf_test_status_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_third_party_bazel_src_main_protobuf_test_status_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestCase); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
 			}
 		}
-		wireType := int(wire & 0x7)
-		switch wireType {
-		case 0:
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				iNdEx++
-				if dAtA[iNdEx-1] < 0x80 {
-					break
-				}
+		file_third_party_bazel_src_main_protobuf_test_status_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TestResultData); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
 			}
-			return iNdEx, nil
-		case 1:
-			iNdEx += 8
-			return iNdEx, nil
-		case 2:
-			var length int
-			for shift := uint(0); ; shift += 7 {
-				if shift >= 64 {
-					return 0, ErrIntOverflowTestStatus
-				}
-				if iNdEx >= l {
-					return 0, io.ErrUnexpectedEOF
-				}
-				b := dAtA[iNdEx]
-				iNdEx++
-				length |= (int(b) & 0x7F) << shift
-				if b < 0x80 {
-					break
-				}
-			}
-			iNdEx += length
-			if length < 0 {
-				return 0, ErrInvalidLengthTestStatus
-			}
-			return iNdEx, nil
-		case 3:
-			for {
-				var innerWire uint64
-				var start int = iNdEx
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return 0, ErrIntOverflowTestStatus
-					}
-					if iNdEx >= l {
-						return 0, io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					innerWire |= (uint64(b) & 0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				innerWireType := int(innerWire & 0x7)
-				if innerWireType == 4 {
-					break
-				}
-				next, err := skipTestStatus(dAtA[start:])
-				if err != nil {
-					return 0, err
-				}
-				iNdEx = start + next
-			}
-			return iNdEx, nil
-		case 4:
-			return iNdEx, nil
-		case 5:
-			iNdEx += 4
-			return iNdEx, nil
-		default:
-			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
 		}
 	}
-	panic("unreachable")
-}
-
-var (
-	ErrInvalidLengthTestStatus = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowTestStatus   = fmt.Errorf("proto: integer overflow")
-)
-
-func init() {
-	proto.RegisterFile("third_party/bazel/src/main/protobuf/test_status.proto", fileDescriptorTestStatus)
-}
-
-var fileDescriptorTestStatus = []byte{
-	// 862 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x53, 0xdd, 0x8e, 0xda, 0x46,
-	0x14, 0x5e, 0xaf, 0x81, 0x35, 0x87, 0x5d, 0x70, 0x26, 0xe9, 0xd6, 0xea, 0xcf, 0x2e, 0x5d, 0xa9,
-	0x0a, 0x4a, 0x23, 0x23, 0x45, 0xca, 0x45, 0x72, 0x67, 0x60, 0x68, 0x51, 0x0c, 0x46, 0x83, 0x69,
-	0x95, 0xde, 0x8c, 0x06, 0x33, 0x01, 0x4b, 0x06, 0x23, 0xcf, 0xb0, 0x11, 0xb9, 0xeb, 0x33, 0xf4,
-	0xa6, 0xcf, 0xd0, 0x27, 0xe9, 0x65, 0x1f, 0xa1, 0xda, 0xbe, 0x48, 0x35, 0x33, 0x66, 0xd5, 0xac,
-	0x92, 0x1b, 0xcb, 0xf3, 0x7d, 0x67, 0xce, 0x9c, 0x9f, 0xef, 0x83, 0x97, 0x72, 0x9d, 0x16, 0x4b,
-	0xba, 0x63, 0x85, 0x3c, 0x74, 0x17, 0xec, 0x03, 0xcf, 0xba, 0xa2, 0x48, 0xba, 0x1b, 0x96, 0x6e,
-	0xbb, 0xbb, 0x22, 0x97, 0xf9, 0x62, 0xff, 0xae, 0x2b, 0xb9, 0x90, 0x54, 0x48, 0x26, 0xf7, 0xc2,
-	0xd7, 0x20, 0xaa, 0x2e, 0x32, 0xf6, 0x81, 0xdf, 0xfc, 0x6e, 0x83, 0x13, 0x73, 0x21, 0xfb, 0x4c,
-	0x70, 0xf4, 0x3d, 0x54, 0x93, 0x75, 0x9a, 0x2d, 0x3d, 0xab, 0x6d, 0x77, 0x1a, 0x2f, 0x5a, 0xbe,
-	0x8e, 0xf1, 0x8f, 0x3c, 0x31, 0x2c, 0x42, 0x50, 0xd9, 0xb2, 0x0d, 0xf7, 0x4e, 0xdb, 0x56, 0xa7,
-	0x4e, 0xf4, 0x3f, 0xfa, 0x16, 0x20, 0xc9, 0x98, 0x10, 0x54, 0x33, 0xb6, 0x66, 0xea, 0x1a, 0x99,
-	0x28, 0xda, 0x87, 0xc7, 0xc5, 0x7e, 0x4b, 0x97, 0xfb, 0x82, 0xc9, 0x34, 0xdf, 0xd2, 0x4d, 0x9a,
-	0x65, 0xa9, 0xf0, 0x2a, 0x6d, 0xab, 0x63, 0x93, 0x47, 0xc5, 0x7e, 0x3b, 0x28, 0x99, 0xb1, 0x26,
-	0xd0, 0x25, 0xd4, 0x0a, 0x2e, 0xf6, 0x99, 0xf4, 0xaa, 0x3a, 0x55, 0x79, 0x42, 0x1d, 0xa8, 0xc8,
-	0xc3, 0x8e, 0x7b, 0xb5, 0xb6, 0xd5, 0x69, 0xbe, 0x78, 0xf2, 0xa0, 0x40, 0x3f, 0x3e, 0xec, 0x38,
-	0xd1, 0x11, 0xc8, 0x87, 0x9a, 0xe9, 0xd7, 0x3b, 0xd3, 0xb1, 0x97, 0x0f, 0x63, 0x67, 0x9a, 0x25,
-	0x65, 0x14, 0xba, 0x04, 0xbb, 0xd8, 0x6f, 0x3d, 0xa7, 0x6d, 0x75, 0x9c, 0xd7, 0x15, 0x59, 0xec,
-	0x39, 0x51, 0xc0, 0xcd, 0x10, 0x2a, 0x2a, 0x2b, 0xba, 0x80, 0x7a, 0x8c, 0x67, 0x31, 0xed, 0x07,
-	0x33, 0xec, 0x9e, 0xa0, 0x26, 0x80, 0x3e, 0xce, 0xe6, 0xa3, 0x18, 0xbb, 0x16, 0x42, 0xd0, 0xd4,
-	0xe7, 0x01, 0xee, 0x47, 0x24, 0x88, 0x23, 0xe2, 0x9e, 0xa2, 0x06, 0x9c, 0xcd, 0x27, 0x6f, 0x26,
-	0xd1, 0x2f, 0x13, 0xd7, 0xbe, 0xf9, 0x01, 0x6a, 0xe6, 0x45, 0x04, 0x50, 0x9b, 0x06, 0xb3, 0x19,
-	0x1e, 0xb8, 0x27, 0xea, 0x7f, 0x18, 0x8c, 0x42, 0x3c, 0x70, 0x2d, 0x54, 0x87, 0x2a, 0x26, 0x44,
-	0xdd, 0xbc, 0xf9, 0xad, 0x0a, 0x4d, 0x55, 0x28, 0xd1, 0x5d, 0x0f, 0x98, 0x64, 0xe8, 0x2b, 0x70,
-	0x12, 0x96, 0xac, 0xd9, 0x22, 0xe3, 0x9e, 0xa5, 0x8a, 0x24, 0xf7, 0x67, 0x74, 0x0d, 0x0d, 0xbd,
-	0xe0, 0x1d, 0x13, 0x82, 0x2f, 0xf5, 0x5e, 0x1c, 0x02, 0x0a, 0x9a, 0x6a, 0x04, 0xbd, 0xba, 0x1f,
-	0x86, 0xfd, 0xd1, 0x30, 0x7a, 0xea, 0xab, 0x1e, 0x32, 0xa5, 0xbd, 0xae, 0x4f, 0x22, 0x3a, 0x8b,
-	0x83, 0x78, 0x3e, 0xbb, 0x9f, 0xcb, 0x35, 0x34, 0xde, 0xb1, 0x34, 0xe3, 0x4b, 0x9a, 0xe5, 0x2b,
-	0xb5, 0x31, 0xbb, 0x53, 0x27, 0x60, 0xa0, 0x30, 0x5f, 0x09, 0xe4, 0xc1, 0xd9, 0x7b, 0x56, 0x6c,
-	0xd3, 0xed, 0xca, 0xab, 0x6a, 0xf2, 0x78, 0x44, 0xdf, 0xc1, 0xf9, 0x9a, 0x09, 0x9a, 0xe4, 0xb7,
-	0xbc, 0x60, 0x2b, 0xb3, 0x34, 0x87, 0x34, 0xd6, 0x4c, 0xf4, 0x4b, 0x08, 0x3d, 0x85, 0x56, 0xc1,
-	0x37, 0xb9, 0xe4, 0xd9, 0x81, 0xaa, 0x76, 0xf8, 0x52, 0xaf, 0xcb, 0x21, 0xcd, 0x23, 0xdc, 0xd7,
-	0x28, 0x7a, 0x0e, 0x28, 0x15, 0xd4, 0x80, 0x54, 0xc8, 0x82, 0x49, 0xbe, 0x3a, 0x98, 0x6d, 0x11,
-	0x37, 0x15, 0x44, 0x13, 0xb3, 0x12, 0x57, 0x6a, 0xd4, 0x03, 0x91, 0xe9, 0x86, 0x0b, 0xaf, 0xde,
-	0xb6, 0x3b, 0x36, 0xa9, 0x2b, 0x24, 0x56, 0x80, 0xa2, 0xcd, 0xa8, 0x54, 0x4f, 0x1e, 0x18, 0xb1,
-	0x1a, 0x24, 0xcc, 0x57, 0xea, 0x2d, 0x33, 0xce, 0x22, 0x4f, 0xb8, 0x10, 0x65, 0x96, 0x86, 0xce,
-	0xe2, 0xea, 0xa9, 0x1a, 0xc2, 0x24, 0xfb, 0x8c, 0xb4, 0xcf, 0x3f, 0x27, 0xed, 0xe7, 0xa0, 0x2b,
-	0xa1, 0x09, 0x13, 0xdc, 0xbb, 0x68, 0x5b, 0x9f, 0x32, 0x9a, 0x23, 0x8f, 0x96, 0x0c, 0xe0, 0xa2,
-	0x1c, 0x7f, 0xb9, 0xc0, 0xa6, 0x5e, 0xe0, 0x37, 0xe5, 0x8d, 0xa1, 0xe6, 0x8e, 0xf7, 0x44, 0xa9,
-	0xe9, 0x73, 0x73, 0xa5, 0xd4, 0xdb, 0x4b, 0xf8, 0x52, 0x48, 0x56, 0x98, 0x69, 0x94, 0xe5, 0x51,
-	0xbe, 0xcb, 0x93, 0xb5, 0xd7, 0xd2, 0x45, 0x3e, 0xd1, 0xb4, 0xea, 0xc6, 0x94, 0x88, 0x15, 0xf7,
-	0x2c, 0x84, 0x2f, 0x3e, 0x99, 0x1d, 0x39, 0x50, 0x19, 0xce, 0xc3, 0xd0, 0xb5, 0x94, 0xc0, 0xa7,
-	0x01, 0x89, 0x47, 0x41, 0xe8, 0x9e, 0xa2, 0x47, 0x70, 0x31, 0x89, 0x62, 0x1a, 0xfc, 0x1c, 0x8c,
-	0xc2, 0xa0, 0x17, 0x62, 0xd7, 0xd6, 0x8a, 0x1e, 0x4f, 0xe3, 0xb7, 0x6e, 0xe5, 0xd9, 0x9f, 0x16,
-	0xb4, 0x1e, 0xa8, 0x4d, 0x59, 0xea, 0x5e, 0x6f, 0xc6, 0x0b, 0xa5, 0x2f, 0xb4, 0x17, 0x86, 0x61,
-	0xf0, 0xe6, 0xad, 0x71, 0x51, 0x3c, 0x1a, 0xe3, 0x68, 0x1e, 0xbb, 0xf6, 0xff, 0xfc, 0x52, 0x51,
-	0x16, 0x1c, 0x4d, 0xfa, 0xd1, 0x78, 0x1a, 0xe2, 0x18, 0xbb, 0x55, 0x65, 0x41, 0x82, 0xc7, 0x51,
-	0x8c, 0xa9, 0x0a, 0x99, 0x13, 0xec, 0xd6, 0xd0, 0x63, 0x68, 0x99, 0x78, 0x1a, 0x47, 0xb4, 0x37,
-	0x1f, 0x85, 0x03, 0xf7, 0x0c, 0x5d, 0xc3, 0xd7, 0xbd, 0x30, 0xf8, 0x15, 0xd3, 0x9f, 0x82, 0x30,
-	0xc6, 0x03, 0xda, 0xc3, 0xc3, 0x88, 0x60, 0xaa, 0xfc, 0x3b, 0x9a, 0xfc, 0xe8, 0x3a, 0xbd, 0x57,
-	0x7f, 0xdd, 0x5d, 0x59, 0x7f, 0xdf, 0x5d, 0x59, 0xff, 0xdc, 0x5d, 0x59, 0x7f, 0xfc, 0x7b, 0x75,
-	0x02, 0x4f, 0x93, 0x7c, 0xe3, 0xaf, 0xf2, 0x7c, 0x95, 0x71, 0x7f, 0xc9, 0x6f, 0x65, 0x9e, 0x67,
-	0xc2, 0x5f, 0xec, 0xd3, 0x6c, 0xe9, 0x67, 0xe9, 0xc2, 0xbf, 0x4d, 0xf9, 0x7b, 0x5f, 0xed, 0xec,
-	0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc9, 0xa5, 0x21, 0x0d, 0x8e, 0x05, 0x00, 0x00,
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_third_party_bazel_src_main_protobuf_test_status_proto_rawDesc,
+			NumEnums:      4,
+			NumMessages:   2,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_third_party_bazel_src_main_protobuf_test_status_proto_goTypes,
+		DependencyIndexes: file_third_party_bazel_src_main_protobuf_test_status_proto_depIdxs,
+		EnumInfos:         file_third_party_bazel_src_main_protobuf_test_status_proto_enumTypes,
+		MessageInfos:      file_third_party_bazel_src_main_protobuf_test_status_proto_msgTypes,
+	}.Build()
+	File_third_party_bazel_src_main_protobuf_test_status_proto = out.File
+	file_third_party_bazel_src_main_protobuf_test_status_proto_rawDesc = nil
+	file_third_party_bazel_src_main_protobuf_test_status_proto_goTypes = nil
+	file_third_party_bazel_src_main_protobuf_test_status_proto_depIdxs = nil
 }